Short circuit AND
Microchanges to appease linter