Initial cleanup with macros