Continued refacotring