Eliminated semicolons at the end of the macros to comply with coding style