Refactoring uncomleted
Refactoring completed