Formatting changes, package.json additions