more template work
cleanup