Clean up used imports and formatting