Fix, prettify pager code

Change-Id: Ia39ad69e8f68802d9642218ac9eab1bd7afa8a10