Fixed warnings found by clang.  Removed some trailing whitespace.