Completed refactor