bundle thoughts + cleanup