Changed 1 line functions to macros
Changed 1 line functions to macros