More cleanup.
More cleanup and restructure.