some refactoring in --more and --list and also clearer output