cleaned up membership controller