improve format of output, add csv formatter