Made loops cleaner