Changed content of AndSpace and SpaceAndSpace to correct spaces