Cleaned up space/location creation.