fix formatting and imports