fetchPages update + Cleanup

* Updated fetchPages to make it a little more efficient and flexible.