More changes and cleanup.