179: refactor