Polish Groups pg cont., refactor