Refactored the Rakefile
Fix the script
Cleanup the rake task