Replacing direct member access with getter usage