refactored Rakefile