changed macros and indent