CS fixes

Those should probably have been picked up by the Codesniffer - but the rules might not exist for it yet.