Fix formatting and clean imports