Refactor facts