Updated checks, to be more sane
Again, minor updates, and spacing
Removing code duplication