Refactor how checks are made.