Cleaned up MemberListHandler. Added TODO's for refactoring.