Refactor checkers
3 files changed