Refactor complete