Cleanups maybe better maybe?
Whoopsies.
Make weird condition checking more efficient.
Merge pull request #1 from Stephen304/refactor

Refactor yayz