WIP on macro clean up