Rakefile refactoring update