Use extension object for dsl.
Fix formatting.