More alteratations to make conversion to bool work.

Also more formatting changes