restructuring: codesniffer working