Some tidy, more info, change loop method