[NF] refactoring.