front end cleaning
small debug
code cleaning