427: refactor