Bit of option cleanup