Refactor rakefile after review. See #21