More consistent spacing, #1