Update to v1.2.3, code clean