Fixed codesniffer mistakes and switched around a line