More cleanup.
Moved a couple of objects to a single one.