Refactored checker