We are doing this refactor for the sake of keeping our template consistent with the indentation policy and maintaining its readability at the same time.