Updated Rakefile with consistent code