Adding in some stylistic updates