156: refactor