A bit of a cleanup.