Clean Rakefile up
Cleaning it up