Removed #define that leaked into the global scope, and made indentation consistent.