[RFT] Minor code refactoring.