Further Style Edits