Add OldHash correctly
whitespace
more whitespace

Fix odd formatting on templates.