Adjust space and comas