refine DSL syntax