more refactoring of the Rakefile