Minor option cleanup