Cleaned up rakefile