fixing CodeSniffer inconsistencies