Fix: Refactor in getter/setter.