Added some changes for the new linter