[PLINK-588] - Code refactoring.