Checking refactored