* re-organise macros