Sort out linting
6 files changed