Refactor facts 

should that be in another namespace?