more refactorings made to the DSL parser