215: refactor