IN-546 - correct indentation of template if-then, remove a redundant if-then