More code cosmetic and formatting fixes to remove warnings while building with clang