Remove usage of %i