Updated Rakefile
Refactoring