Many rework and cleanup.