U: refactor log