removed semicolons on macros