Refactoring DSL withing module