WIP - fix linter