Newline between each afc template
Remove unnecessary comments, reorder, more descriptive parameter names