Fixing linter errors