Several style improvements