main fixes after linting