116: refactor