Minor cleanup on validation