Minor formatting changes/code cleanup.
Small updates.