Get rid of some cruft. Improve template.