formatting and imports cleanup