Refactor DSL methods and CleanRoom