Refactor Complete