172: refactor