Fix incorrect comparisons with True/False/None
Fix formatting