automatic template selection when creating
minor text changes and organize imports