Resolving warnings

Resolved all but one warning
Formatting updates
Added explanatory comments to unused suppressions if necessary.