#1348 cleaning up some formatting