Clean up the Rakefile a bit