Fixing some codesniffer items and adding comments