Formatting changes and clean up the wording on Context