Streamline output handling

[nyurik]

There is a lot of if/else if/... code to handle various output cases. I think it can be streamlined and simplified.