Some more stylistic updates...