fixes #2961 - Refactoring of output and formatters