80: refactor