Rename conditional_tag and remove unnecessary helpers