Minor pass at style adjustments