js cleanup amnd comments fix