Some formatting changes, setup for js