Some cleanups and simplifications in index page loading in PageLoader