Continued refactoring of Rakefile for usability