Initial tweaks for loop usage