Cleaned up spaces