Improve Rakefile