Improve the Rakefile