Refactor
Completed refactor