Clean-ups and different looping suggestion