More formatting and consistency fixes

may as well get rid of the parentheses around the false.