Code clean up for debug message