Refactoring and some macros