310: refactor