Some structural and style adjustments