Cleanup extra spaces