Refactored checkers.