Refactored single-seat checkers again