Tidy Up

Removed comments and changed page template names.