Cleanup spaces again