Cleanup and new config DSL