fix + cleanup