Option -> Opt
cleanup