137: refactor