Continue to refine Rakefile