A few more style adjustments