Code beautification and some more logging data - no changes in the functionality.