Fixed codesniffer issues, Please review the merge request.