cwc: cleanup and better wording in debug logging