437: refactor