Adding missing semicolons, better structured if statements

No match.