Fix comments
Merge pull request #4561 from openscholar/4351-1

Combine 'if' statements into one condition