Population:  more refactoring