Cleanup: Reorganized delegate methods to be in same order as in Apple Docs