65: refactor