Cleanup if statements.
Merge pull request #45 from murrekatt/main_cleanup

Cleanup if statements.