2068: refactor