Indent Fix + Replace While with For loop