Closes #6 CodeSniffer fixes