Add humanize and tidy