refactor facts models and utils