clean up code according to linter