minor option cleanup