Tidy imports and formatting