More template format fixes, chasing PEP8