Reduce line lengths, including use of continue