Some how to formatting improvements.