refactor evaluate

move to module DSL