refactored rakefile