removed yoda condition