Reoganizing Pi calculations