Fixes CodeSniffer issues