Reverted the refactoring, update the debugging message