Formatting corrections

Removed trailing whitespace at line ends.
Misc changes

Minor changes done