Continued refactoring
Continued refactoring
Continued refactoring
Continue refactoring
Continued refactoring
Continued with refactoring
Continued refactoring
Continued refactoring