refactor Rakefile