bugfix, code clean