143: refactor