More facts, refactoring