made macros a little more legible