Cleaned validation