Simplifying

Yay macros!