Cleaned up Member Subtype and