Prisoner Generation

made a prisoner factory, changed code to match guidelines further