a little clean up of the default functional overrides