Please avoid gratuitously reformatting existing code; make your diff as small as possible if you want it reviewed.