Refactor Checks with Validation