Reduce line lengths;
pick 4 spaces, not tabs, and minor edtis