Fixed unnecessary changes

Forgot to change some of the if and else if's back to the way they were.
It still works as is, but decided it'd be best to leave it the way it
was before.

Please refer to my commit before this for the major changes that were
made.