Linting rewrite wip