Improve rakefile