Enforce 80 columns and some minor cleanups in code.