simplified clone (good enough)
some cleanup