Rakefile cleaned up