Fix dump command

Also code style