Completed refactor
Completed refactor