Use common styling
Spacing
Remove double for loop