a little more tidying up of assets_common