Tidy up of Members app