Additional formatting clean ups

2019-07-19, Gary Kramlich