Re-organizing Rakefile for readability