Resolved warnings

Resolved warnings
Formatting changes