Cleanup CodeSniffer fixes in #1755

@rarila has enhanced codesniffer in #1759 therefore #1755 should be closed and cleaned up