Makes the checks more rational

Simplifies the logic of the checks.
Also removes the magic 8.