U: refactor. see totorojs/totoro-server#47