Refactor to pass skeptic