Got rid of the last bits of shouting defines
Refactored settings and global state to reduce overhead Consolidated configuration into class constants (I really didn't like all the shouting in the code :-))