rakefile refactored