Do we need these extra spaces?