More objects. More utility cleanup