Reformatted style.
Some cleanup.