Continued refactoring
Continued refactoring