Cleaning up rouge semi-colon and whitespace