Removed the last #define - #undef pattern/macros & fixed a crashing bug on line 1449

Whitespace changes