4 tidy up templates

close #4