Reorganized, added check when expanding PrimePiList