Code Clean-up

Code Clean-up in view pages