401 Refactoring for output dump