Finished 80-column formatting