JS String IntelliSense refactoring & minor fixes