Refactored checks