Lint passing
Merge branch 'linting'