more template boilerplate clean up