Refactored class members as instance members.  Core concept.