code cleanup - reduce line lengths to 198

The old max line lenght was 1981