Zombie class refacotring