Revert "More code cleanup"

This reverts commit e10b209598ac4bce99493a4bf3a557f326e54198.

Better make all members private.
ExpressionType: make all members private