some stylistic updates