Personal fixing IFs

Fixing all the IF statements.