I think these two lines can be deleted in favor of the identical 2 below at L56-L57