partial cleanup of option listing