fix formatting
mini-refactoring: extract constant
mini-refactoring: remove unused imports
Merge branch 'cleanups'