Refactor package,debug message