Interim work on linting