More macro cleanup