remove repetition in listing, and minor changes