Template cleanup/beautification.