147: refactor