Fixed up formatting, and nits