Fixing linter warnings