Continue Refactor