Update sketch file extension use.
Formatting cleanup.
Remove some iteration warnings.