Make csv output optional
Simplify usage message in CLI