Start to make the core templates more readable

Yay for line breaks.