Minor formatting fixes and improvements.