Refactor Completed