Fixing remaining linting errors