Cleaned up messy spaces