lots of stylistic updates