2425: refactor