299: refactor