Spacing/formatting fixes