Refactoring continues #3.6
Refactoring continues #3.6
Refactoring continues #3.7