Whitespace and comments
Altered DSL for consistency