Reformatted a few Files

I also made minor changes that will have no real performance impact.