Combined if statements

Nvm, found the issue, was wrong linking of other statements, so nothing was wrong with my code. REQ for deletion.