Yoda style expressions I fixed