Refactoring, and a page number label