Fixed up some of the style adjustments to pass tests.