Replaced iVars with properties.
Some clean-up.