Reformat everything.  Cleanup.  Add string formatting prototype func.