Finish the refactor