Source reformat
Simplify loop