Small amount of cleanup.