major stylistic updates