Move away from iVars to properties