Style updates.
Line wrap fix to pass unit tests.