Removed conditional assignment in if statement
Removed conditional assignment in if statement