[NF] Refactoring.