more minor cleanup.