Very nice cleanup.