cosmetic changes in option handling