Some more refactoring following the elimination of the intermediate file. Don't