bug fixing and code cleaning
code clean