Removed postfix if
Removed postfix if, moved to bind variables.
Removed postfix if