reorg of js location and comment cleanup
reorg of js location and comment cleanup