Formatting changes
Added String
JS for strings due to onstream %