make the filename more easier to associate with the template

otherwise, in the case of an error you have to work out which template
is causing the error only from the pre-processed template contents
fix controller action variables
prevent excessive whitespace

only need one newline between each method