Spacing, newline fixes