greatly simplified the Rakefile