Small improvement to avoid duplication