Minor stylistic and formatting changes