Restructing template to not contain blank lines.