Fix typo & reorg facts
Refactoring rename & extract functions