Continued refactor