Cleaned up a templates a bit