Indentation improvements and trim trailing spaces from comments.
Clean up structs/enums.
CID 966060.
Clean up dead code.