Cleanup some DSL methods

This is the first pass at cleaning up the DSL and trying to standardize on an API