#313 - Additional tweaks to if statements for coding standards