Slight stylistic updates