Continue to refactor