some minor cleanup.