Remove extra spaces which aren't needed