2422: refactor