Template cleanups refs #4