Better format samples output

Group samples similar to other clients.
@tailsu @teobugslayer @Fatme