cleaning requirements, moving iteration loop intrnally to each handler, update #1554