Tidy up of MPI PI Example