Apply minimal fixes

Check Codesniffer results