Refactor finished
Refactor finished