Begin cleaning up the C code to wrap at 80 lines...