Fix drawing + Clean