Refactoring on choreography creation and better equals for spec classes