Spacing and brace fix