Some changes for the greater good

put this check in a function with a nice name (self documenting code man... it's the bomb)