Minor changes and cleanup.