cleanup + updated version