linter #cleanup