Added membership ID and general tidying up