improved java#organize_imports