Style cleanup

No change in functionality, just cleaning up the style a bit.