cleaned up some code with new macros