feat(list): refactor the list command a bit