Cleaned up macros