Cleaned up validation checks