Separation of the paging code, plus minor cleanup, while my wife watched 30 rock… and I half watched. ;)