minor cleanup
improve option validator