Cleaned up Rakefile