Formatting changes and tweaks based on Prachi's comments