Reflowed whitespace.
Should have tested first, I know.
Some small fixes from the tests.
Removed unused template.