Fixed more linter errors