Reorganized code to never go beyond 80 columns
Reorganized to make better use of file real-estate