This commit makes the js code clean.