Reorganizing code and comments to make code slimer than 80 columns