Formatting

Aligning like items in the main loop