refactored rakefile
more rakefile cleanup