some refactoring
refactoring and Groupoids
Bicategories and Adjunctions