Fix + cleanup