diff --git a/src/Template/Simple.php b/src/Template/Simple.php
index 6d852c4..ca382cb 100644
--- a/src/Template/Simple.php
+++ b/src/Template/Simple.php
@@ -75,7 +75,7 @@ public function composeCsv($view = null, array $data = [], $status = 200, array
     public function composeHtml($view = null, array $data = [], $status = 200, array $config = [])
     {
         if (! isset($view)) {
-            throw new InvalidArgumentException("Missing [\$view].");
+            throw new InvalidArgumentException('Missing [$view].');
         }
 
         if (! $view instanceof View) {
diff --git a/src/Template/Template.php b/src/Template/Template.php
index 3312f58..5728f91 100644
--- a/src/Template/Template.php
+++ b/src/Template/Template.php
@@ -33,6 +33,7 @@ abstract class Template
      * Default format.
      *
      * @var string
+     *
      * @deprecated 3.1
      */
     protected $defaultFormat = 'html';
@@ -53,6 +54,7 @@ public function __construct(Factory $view, Transformable $transformable = null)
      * Get default format.
      *
      * @return string
+     *
      * @deprecated 3.1
      */
     public function getDefaultFormat()
diff --git a/tests/FacileTest.php b/tests/FacileTest.php
index a0c2df7..7c76bd4 100644
--- a/tests/FacileTest.php
+++ b/tests/FacileTest.php
@@ -23,7 +23,7 @@ public function tearDown()
     public function testConstructMethod()
     {
         $request = m::mock('\Illuminate\Http\Request');
-        $view    = m::mock('\Illuminate\Contracts\View\Factory');
+        $view = m::mock('\Illuminate\Contracts\View\Factory');
 
         $stub = new Facile(new Factory($request), new Simple($view), [], 'json');
 
@@ -32,13 +32,14 @@ public function testConstructMethod()
         $data->setAccessible(true);
 
         $expected = [
-            'view'   => null,
-            'data'   => [],
+            'view' => null,
+            'data' => [],
             'status' => 200,
-            'on'     => [
+            'on' => [
+                'csv' => ['only' => null, 'except' => null, 'uses' => 'data'],
                 'html' => ['only' => null, 'except' => null],
                 'json' => ['only' => null, 'except' => null],
-                'csv'  => ['uses' => 'data'],
+                'xml' => ['only' => null, 'except' => null, 'root' => null],
             ],
         ];
 
@@ -53,7 +54,7 @@ public function testConstructMethod()
     public function testViewMethod()
     {
         $request = m::mock('\Illuminate\Http\Request');
-        $view    = m::mock('\Illuminate\Contracts\View\Factory');
+        $view = m::mock('\Illuminate\Contracts\View\Factory');
 
         $stub = new Facile(new Factory($request), new Simple($view), [], 'json');
 
@@ -77,7 +78,7 @@ public function testViewMethod()
     public function testWhenMethod($before, $after)
     {
         $request = m::mock('\Illuminate\Http\Request');
-        $view    = m::mock('\Illuminate\Contracts\View\Factory');
+        $view = m::mock('\Illuminate\Contracts\View\Factory');
 
         $stub = new Facile(new Factory($request), new Simple($view), [], 'json');
 
@@ -101,7 +102,7 @@ public function testWhenMethod($before, $after)
     public function testOnMethod($before, $after)
     {
         $request = m::mock('\Illuminate\Http\Request');
-        $view    = m::mock('\Illuminate\Contracts\View\Factory');
+        $view = m::mock('\Illuminate\Contracts\View\Factory');
 
         $stub = new Facile(new Factory($request), new Simple($view), [], 'json');
 
@@ -124,7 +125,7 @@ public function testOnMethod($before, $after)
     public function testWithMethod()
     {
         $request = m::mock('\Illuminate\Http\Request');
-        $view    = m::mock('\Illuminate\Contracts\View\Factory');
+        $view = m::mock('\Illuminate\Contracts\View\Factory');
 
         $stub = new Facile(new Factory($request), new Simple($view), [], 'json');
 
@@ -148,7 +149,7 @@ public function testWithMethod()
     public function testStatusMethod()
     {
         $request = m::mock('\Illuminate\Http\Request');
-        $view    = m::mock('\Illuminate\Contracts\View\Factory');
+        $view = m::mock('\Illuminate\Contracts\View\Factory');
 
         $stub = new Facile(new Factory($request), new Simple($view), [], 'json');
 
@@ -170,10 +171,10 @@ public function testStatusMethod()
      */
     public function testTemplateMethod()
     {
-        $request  = m::mock('\Illuminate\Http\Request');
-        $view     = m::mock('\Illuminate\Contracts\View\Factory');
+        $request = m::mock('\Illuminate\Http\Request');
+        $view = m::mock('\Illuminate\Contracts\View\Factory');
 
-        $env      = new Factory($request);
+        $env = new Factory($request);
         $template = new Simple($view);
 
         $env->template('foo', $template);
@@ -182,7 +183,7 @@ public function testTemplateMethod()
 
         $stub->template('foo');
 
-        $refl     = new \ReflectionObject($stub);
+        $refl = new \ReflectionObject($stub);
         $template = $refl->getProperty('template');
         $template->setAccessible(true);
 
@@ -190,7 +191,7 @@ public function testTemplateMethod()
 
         $stub->template(new Simple($view));
 
-        $refl     = new \ReflectionObject($stub);
+        $refl = new \ReflectionObject($stub);
         $template = $refl->getProperty('template');
         $template->setAccessible(true);
 
@@ -204,7 +205,7 @@ public function testTemplateMethod()
      */
     public function testFormatMethod()
     {
-        $request  = m::mock('\Illuminate\Http\Request');
+        $request = m::mock('\Illuminate\Http\Request');
         $template = m::mock('\Orchestra\Facile\Template\Simple');
 
         $request->shouldReceive('prefers')->once()->with('jsonp')->andReturn('jsonp');
@@ -216,7 +217,7 @@ public function testFormatMethod()
 
         $stub->format('md');
 
-        $refl   = new \ReflectionObject($stub);
+        $refl = new \ReflectionObject($stub);
         $format = $refl->getProperty('format');
         $format->setAccessible(true);
 
@@ -230,7 +231,7 @@ public function testFormatMethod()
      */
     public function testRenderMethod()
     {
-        $request  = m::mock('\Illuminate\Http\Request');
+        $request = m::mock('\Illuminate\Http\Request');
         $template = m::mock('\Orchestra\Facile\Template\Simple');
 
         $request->shouldReceive('prefers')->once()->with('jsonp')->andReturn('jsonp');
@@ -249,7 +250,7 @@ public function testRenderMethod()
      */
     public function testToStringMethod()
     {
-        $request   = m::mock('\Illuminate\Http\Request');
+        $request = m::mock('\Illuminate\Http\Request');
         $template1 = m::mock('\Orchestra\Facile\Template\Simple');
 
         $template1->shouldReceive('compose')->once()
@@ -288,24 +289,26 @@ public function dataProviderForWhenTest()
         return [
             [
                 [
-                    'view'   => null,
-                    'data'   => [],
+                    'view' => null,
+                    'data' => [],
                     'status' => 200,
-                    'on'     => [
+                    'on' => [
+                        'csv' => ['only' => null, 'except' => null, 'uses' => 'data'],
                         'html' => ['only' => null, 'except' => null],
                         'json' => ['only' => null, 'except' => null],
-                        'csv'  => ['uses' => 'data'],
+                        'xml' => ['only' => null, 'except' => null, 'root' => null],
                     ],
                 ],
                 [
-                    'view'   => null,
-                    'data'   => [],
+                    'view' => null,
+                    'data' => [],
                     'status' => 200,
-                    'on'     => [
+                    'on' => [
+                        'csv' => ['only' => null, 'except' => null, 'uses' => 'data'],
                         'html' => ['only' => null, 'except' => null],
                         'json' => ['only' => null, 'except' => null],
-                        'csv'  => ['uses' => 'data'],
-                        'foo'  => ['uses' => 'foobar'],
+                        'xml' => ['only' => null, 'except' => null, 'root' => null],
+                        'foo' => ['uses' => 'foobar'],
                     ],
                 ],
             ],
diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
index aa61bee..81c8292 100644
--- a/tests/FactoryTest.php
+++ b/tests/FactoryTest.php
@@ -24,7 +24,7 @@ public function testConstructMethod()
 
         $stub = new Factory($request);
 
-        $refl      = new \ReflectionObject($stub);
+        $refl = new \ReflectionObject($stub);
         $templates = $refl->getProperty('templates');
         $templates->setAccessible(true);
 
@@ -38,7 +38,7 @@ public function testConstructMethod()
      */
     public function testMakeMethod()
     {
-        $request  = m::mock('\Illuminate\Http\Request');
+        $request = m::mock('\Illuminate\Http\Request');
         $template = m::mock('\Orchestra\Facile\Template\Template');
 
         $template->shouldReceive('compose')->once()->with('json', m::any())->andReturn('foo');
@@ -56,13 +56,14 @@ public function testMakeMethod()
         $data->setAccessible(true);
 
         $expected = [
-            'view'   => null,
-            'data'   => ['foo' => 'foo is awesome'],
+            'view' => null,
+            'data' => ['foo' => 'foo is awesome'],
             'status' => 200,
-            'on'     => [
+            'on' => [
+                'csv' => ['only' => null, 'except' => null, 'uses' => 'data'],
                 'html' => ['only' => null, 'except' => null],
                 'json' => ['only' => null, 'except' => null],
-                'csv'  => ['uses' => 'data'],
+                'xml' => ['only' => null, 'except' => null, 'root' => null],
             ],
         ];
 
@@ -78,7 +79,7 @@ public function testMakeMethod()
      */
     public function testViewMethod()
     {
-        $request  = m::mock('\Illuminate\Http\Request');
+        $request = m::mock('\Illuminate\Http\Request');
         $template = m::mock('\Orchestra\Facile\Template\Template');
 
         $request->shouldReceive('prefers')->once()->with('html')->andReturn('html');
@@ -97,13 +98,14 @@ public function testViewMethod()
         $data->setAccessible(true);
 
         $expected = [
-            'view'   => 'foo.bar',
-            'data'   => ['foo' => 'foo is awesome'],
+            'view' => 'foo.bar',
+            'data' => ['foo' => 'foo is awesome'],
             'status' => 200,
-            'on'     => [
+            'on' => [
+                'csv' => ['only' => null, 'except' => null, 'uses' => 'data'],
                 'html' => ['only' => null, 'except' => null],
                 'json' => ['only' => null, 'except' => null],
-                'csv'  => ['uses' => 'data'],
+                'xml' => ['only' => null, 'except' => null, 'root' => null],
             ],
         ];
 
@@ -119,7 +121,7 @@ public function testViewMethod()
      */
     public function testWithMethod()
     {
-        $request  = m::mock('\Illuminate\Http\Request');
+        $request = m::mock('\Illuminate\Http\Request');
         $template = m::mock('TemplateDriver', '\Orchestra\Facile\Template\Template');
 
         $request->shouldReceive('prefers')->once()->with('html')->andReturn('html');
@@ -139,13 +141,14 @@ public function testWithMethod()
         $data->setAccessible(true);
 
         $expected = [
-            'view'   => null,
-            'data'   => ['foo' => 'foo is awesome'],
+            'view' => null,
+            'data' => ['foo' => 'foo is awesome'],
             'status' => 200,
-            'on'     => [
+            'on' => [
+                'csv' => ['only' => null, 'except' => null, 'uses' => 'data'],
                 'html' => ['only' => null, 'except' => null],
                 'json' => ['only' => null, 'except' => null],
-                'csv'  => ['uses' => 'data'],
+                'xml' => ['only' => null, 'except' => null, 'root' => null],
             ],
         ];
 
@@ -165,7 +168,7 @@ public function testTemplateMethod()
 
         $stub = new Factory($request);
 
-        $refl      = new \ReflectionObject($stub);
+        $refl = new \ReflectionObject($stub);
         $templates = $refl->getProperty('templates');
         $templates->setAccessible(true);
 
@@ -183,7 +186,7 @@ public function testTemplateMethod()
      */
     public function testTemplateMethodThrowsException()
     {
-        $request  = m::mock('\Illuminate\Http\Request');
+        $request = m::mock('\Illuminate\Http\Request');
         $template = m::mock('BadFooTemplateStub');
 
         $stub = new Factory($request);
diff --git a/tests/Template/SimpleTest.php b/tests/Template/SimpleTest.php
index 81b1f2d..54864ab 100644
--- a/tests/Template/SimpleTest.php
+++ b/tests/Template/SimpleTest.php
@@ -26,7 +26,7 @@ public function testConstructMethod()
         $stub = new Simple($view);
         $refl = new \ReflectionObject($stub);
 
-        $formats       = $refl->getProperty('formats');
+        $formats = $refl->getProperty('formats');
         $defaultFormat = $refl->getProperty('defaultFormat');
 
         $formats->setAccessible(true);
diff --git a/tests/Template/TemplateTest.php b/tests/Template/TemplateTest.php
index f5a22cd..bd3e7be 100644
--- a/tests/Template/TemplateTest.php
+++ b/tests/Template/TemplateTest.php
@@ -26,7 +26,7 @@ public function testConstructMethod()
         $stub = new TemplateTemplateStub($view);
         $refl = new \ReflectionObject($stub);
 
-        $formats       = $refl->getProperty('formats');
+        $formats = $refl->getProperty('formats');
         $defaultFormat = $refl->getProperty('defaultFormat');
 
         $formats->setAccessible(true);
@@ -61,8 +61,8 @@ public function testComposeMethod()
 
         $stub = new TemplateTemplateStub($view);
         $data = [
-            'view'   => null,
-            'data'   => [],
+            'view' => null,
+            'data' => [],
             'status' => 200,
         ];
 
@@ -84,8 +84,8 @@ public function testComposeMethodReturnResponseError406WhenGivenInvalidFormat()
 
         $stub = new TemplateTemplateStub($view);
         $data = [
-            'view'   => null,
-            'data'   => [],
+            'view' => null,
+            'data' => [],
             'status' => 200,
         ];
 
@@ -106,8 +106,8 @@ public function testComposeMethodThrowsExceptionWhenMethodNotAvailable()
 
         $stub = new TemplateTemplateStub($view);
         $data = [
-            'view'   => null,
-            'data'   => [],
+            'view' => null,
+            'data' => [],
             'status' => 200,
         ];
 
@@ -190,7 +190,7 @@ public function testTransformToArrayMethodWhenItemIsRenderable()
      */
     public function testTransformToArrayMethodWhenItemInstanceOfPaginator()
     {
-        $view    = m::mock('\Illuminate\Contracts\View\Factory');
+        $view = m::mock('\Illuminate\Contracts\View\Factory');
         $results = ['foo' => 'foobar'];
 
         $paginator = new Paginator($results, 3, 1);
@@ -198,11 +198,11 @@ public function testTransformToArrayMethodWhenItemInstanceOfPaginator()
         $stub = new TemplateTemplateStub($view);
 
         $expected = [
-            'per_page'      => 3,
-            'current_page'  => 1,
-            'from'          => 1,
-            'to'            => 1,
-            'data'          => $results,
+            'per_page' => 3,
+            'current_page' => 1,
+            'from' => 1,
+            'to' => 1,
+            'data' => $results,
             'next_page_url' => null,
             'prev_page_url' => null,
         ];
@@ -248,9 +248,9 @@ public function dataProviderForPrepareDataValue()
         return [
             [
                 [
-                    'view'   => null,
-                    'data'   => $data,
-                    'on'     => [
+                    'view' => null,
+                    'data' => $data,
+                    'on' => [
                         'json' => ['only' => ['foo']],
                     ],
                     'status' => 200,
@@ -259,9 +259,9 @@ public function dataProviderForPrepareDataValue()
             ],
             [
                 [
-                    'view'   => null,
-                    'data'   => $data,
-                    'on'     => [
+                    'view' => null,
+                    'data' => $data,
+                    'on' => [
                         'json' => ['except' => ['foo']],
                     ],
                     'status' => 200,