Clean up imports and formatting