Cleanup, adding spinner