U: refactor totoro-common