Refactoring template structure to prepare for post formats.
Let spaces be spaces!