Reformatting after some nasty changes.
Merging and reformatting.