Reformatted some files.
Added some formatting options.
TODO: More wrapping tests!