Refactoring and a nice clean up on all page view controller