Do a few more style adjustments