2374: refactor