Cleaner validation