code style changed
js refactoring
need bug fix