cleaning up spacing within template markup