Refactor checks