Changing direct variable access to getter/setter based