Style updates, and None-type comparisons should not use boolean operators