modify Rakefile to use Rspec rake task
cleanup code