Completion of refactor