Removal of yoda logic.