PSR2 and ENTB codesniffer fixes