template indentation fixes
more spacing/naming cleanup