A number of style corrections in main source files. Trimmed lines to 120 characters, added some spaces and line breaks. Removed unused imports
A number of style corrections in main source files. Trimmed lines to 120 characters, added some spaces and line breaks. Removed unused imports