Linting
Merge branch 'linting' into develop