Organize imports and format