Fixed issues picked up by PHP Code Sniffer