Organize imports and format code