Fixed two calls to the same function

- also added easy option to switch between CSV and HR output.