linting fixes
more linting