more cleanup of option listing