Modify dsl comments and structure