cleaned up macros