Spacing cleanup