Continued refactoring...