U: refactor code
U: del log