Fixed issue: Cleanup spaces