library: Code cleanup, timing adjustments to pager
library: Reorder methods