Better linting
Refactor utils