#7 + cleanup