[Gardening] Less code on output formatting

Signed-off-by: chatgris <jboyer@af83.com>