The task fell to me to clean this up some.