CodeSniffer fixes

but still long way to pass completely