rake tasks cleanups & desc
updated rspec
Simple -> DSL cleanup