Renamed an unclearly named method
Grouped the methods intended for DSL together