Reduce line lengths and minor style tweaks