spaces and cleanup