Did some clean up to match some of the refactoring.