Added more context, formatting changes.