Comment
CF #17 #18 - format templates a bit