Removed some ugly macros