cleaning up code for codesniffer