Some changes to improve readability.

As the title says... some changes in spaces to improve readability and to keep an uniform style in the htm-based templates.