bit of clean up + new spinner