fix formatting and unused imports