153: refactor