Final stylistic updates