Cleanup && character javascript refactor [skip ci]