Continued refactoring