nit: Remove Sprintfs here too