A little bit of a cleanup.