Cleaning up some logging for more clarity