updated version + cleanup