Addressed review comments. Will add formatted output to --list in next commit