Improve code, less js part
improve code, less js part