Some cleanup and implemented the InitialMembershipListener on the client