Do a little better with loop cleanup