Code Clean-up of WordPress template pages