Refactor Output class, fix bug where output would show only once per command