shorter macros, some cleaning