Made lines under 80 columns
Merged