Updated for codesniffer errors found