removed an unnecessary closure
made define-model use syntax-case
contracts are no longer mandatory on the model