Refactoring in progress
Refactoring progress 2