Refactor facts 

nitpick, that should be in the util file