Minor formatting changes
Added a few logging statements