refactor Group model using population