Cleaning up some logging