Rakefile refactored