Fix template
Merge tidy up