Reformatted a few things again to make them easier to code.