Clean up redundant spaces