Moved for loop, renamed notices