If you must get anal about style, first let’s make clear the original sentence was 100% grammatically correct (see: restrictive clauses). Plus, his was more fun then your i’ve-got-a-grammar-wedgie version. Huzzah!