Minor cleanup

* Comment fix
* Combine two similar IF statements