Non-functional update: wrapping lines longer than 120 chars.