use element ids and clean up