Fixed imports and formatting