More generic check
Adding comment
Removing duplicate declaration