Tidy up, added template file
Tidy up