Clean up and improvments to membership