Checker refactored