Removed redundant if statements.

This is why the || operator exists.
Removed redundant if statements.

This is why the || operator exits. Previous commit had a typo.
Merge pull request #150 from Not-So-Anonymous/minor-improvements

Boop.