Remove while loop

Just go for the straight recursive approach.