Cleaned up full attack macros