minor refactoring
update rakefile