Mass refactoring (again) and got as much out of macros as possible