Refine Rakefile