Fixed spacing in models
Amended template to fix comments