format adjustments
a few style changes