Struggling a bit with cleaning up macros