If statement updated to check all internal statements. Expressions commented