Changed macro if statement structure to brackets