Better whitespacing in templates