little clean up, keeping it close to upstream