Some 80 character cleanup