Formatting changes

Signed-off-by: Steven Downer <grinch@outlook.com>
Resolve a chunk of compilation warnings

Signed-off-by: Steven Downer <grinch@outlook.com>