reformat according to Francois' concerns

Signed-off-by: Daniel Halperin <dhalperi@cs.washington.edu>