modify Rakefile
minor refactgor