cleaned up calls to MPI_Comm_rank and size