SoSome tidying up