Refactoring initial code.
Refactoring initial code.