Eliminate excessive initialized members
Flatten class structure
Eliminate delegate
Clean up accessors and check some NULL values