re-indenting only
added use-macros flag
working on hygiene