Refactor PageParser