fix(tools/DSL): clean up code
fix(tools/DSL): clean up code