Changed expression

rewrote expression as suggested
Checkout rewind

always rewind after creating checkout
reformatted if tests

using yoda conditions