Started refactoring
Refactoring continues
Refactoring continues