Refactored facts and filenames