Some more formatting changes. Starting to convert to handle bools