second sweep code review