Some white space and 80 char overruns corrected.
Signed-off-by: NJon Mason <jon.mason@intel.com>