211: refactor