Reformatting and removing benchmark code