Removed JS imports and some formatting changes