Indentation fixes
Remove bad-macros directory