Conway refactor