2 fixes to enhance readability of source code and debug messages