cleanup to use new rake-style DSL