VID-580 Cleanup in response to code review

* Removed some unecessary methods
* Using better way to get output page object
* Keep naming consistant