diff --git a/.gitignore b/.gitignore
index 0b27101..eac13de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ composer.phar
 composer.lock
 .DS_Store
 /.idea
+.php_cs.cache
diff --git a/.travis.yml b/.travis.yml
index f05ac61..2d5371b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ php:
   - 5.5
   - 5.6
   - 7.1
-  - hhvm
 
 env:
   global:
@@ -22,4 +21,6 @@ install:
   - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-source --no-interaction --prefer-stable; fi
   - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-source --no-interaction --prefer-lowest --prefer-stable; fi
 
-script: ./vendor/bin/kahlan -reporter=verbose
+script:
+  - ./vendor/bin/kahlan -reporter=verbose
+  - ./vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix src/
diff --git a/composer.json b/composer.json
index 87a7747..0c71ab8 100644
--- a/composer.json
+++ b/composer.json
@@ -15,6 +15,7 @@
     },
     "require-dev": {
         "kahlan/kahlan": "^2.4",
-        "illuminate/database": ">=5.2.0"
+        "illuminate/database": ">=5.2.0",
+        "friendsofphp/php-cs-fixer": "^2.2"
     }
 }
diff --git a/src/ReadOnlyException.php b/src/ReadOnlyException.php
index 38f165b..2d588f7 100644
--- a/src/ReadOnlyException.php
+++ b/src/ReadOnlyException.php
@@ -1,7 +1,6 @@
 <?php
 namespace MichaelAChrisco\ReadOnly;
-use RuntimeException;
-
-class ReadOnlyException extends RuntimeException{
 
+class ReadOnlyException extends \RuntimeException
+{
 }
diff --git a/src/ReadOnlyTrait.php b/src/ReadOnlyTrait.php
index cebf653..e235da9 100644
--- a/src/ReadOnlyTrait.php
+++ b/src/ReadOnlyTrait.php
@@ -1,18 +1,25 @@
 <?php
 namespace MichaelAChrisco\ReadOnly;
+
 use Illuminate\Database\Eloquent\Builder;
 use MichaelAChrisco\ReadOnly\ReadOnlyException;
 
-trait ReadOnlyTrait {
+trait ReadOnlyTrait
+{
+    public static function readOnly($class)
+    {
+        throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+    }
+
   /**
    * throws ReadOnlyException on create
    * @method create
    * @param  array $attributes
    *
    */
-  static function create(array $attributes = []){
-    $class = get_called_class();
-    throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+  public static function create(array $attributes = [])
+  {
+      ReadOnlyTrait::readOnly(get_called_class());
   }
 
 /**
@@ -21,9 +28,9 @@ trait ReadOnlyTrait {
  * @param  array       $attributes
  *
  */
-  static function forceCreate(array $attributes){
-    $class = get_called_class();
-    throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+  public static function forceCreate(array $attributes)
+  {
+      ReadOnlyTrait::readOnly(get_called_class());
   }
 
   /**
@@ -32,9 +39,9 @@ trait ReadOnlyTrait {
    * @param  array $options
    *
    */
-  public function save(array $options = []){
-    $class = get_called_class();
-    throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+  public function save(array $options = [])
+  {
+      ReadOnlyTrait::readOnly(get_called_class());
   }
 
 /**
@@ -44,9 +51,9 @@ trait ReadOnlyTrait {
  * @param   $options
  *
  */
-  public function update(array $attributes = [], array $options = []){
-    $class = get_called_class();
-    throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+  public function update(array $attributes = [], array $options = [])
+  {
+      ReadOnlyTrait::readOnly(get_called_class());
   }
 
 /**
@@ -55,9 +62,9 @@ trait ReadOnlyTrait {
  * @param  array         $arr
  *
  */
-  static function firstOrCreate(array $arr){
-    $class = get_called_class();
-    throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+  public static function firstOrCreate(array $arr)
+  {
+      ReadOnlyTrait::readOnly(get_called_class());
   }
 
 /**
@@ -66,9 +73,9 @@ trait ReadOnlyTrait {
  * @param  array      $arr
  *
  */
-  static function firstOrNew(array $arr){
-    $class = get_called_class();
-    throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+  public static function firstOrNew(array $arr)
+  {
+      ReadOnlyTrait::readOnly(get_called_class());
   }
 
 /**
@@ -76,9 +83,9 @@ trait ReadOnlyTrait {
  * @method delete
  *
  */
-  public function delete(){
-    $class = get_called_class();
-    throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+  public function delete()
+  {
+      ReadOnlyTrait::readOnly(get_called_class());
   }
 
 /**
@@ -87,9 +94,9 @@ trait ReadOnlyTrait {
  * @param  mixed  $ids
  *
  */
-  static function destroy($ids){
-    $class = get_called_class();
-    throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+  public static function destroy($ids)
+  {
+      ReadOnlyTrait::readOnly(get_called_class());
   }
 
 /**
@@ -97,9 +104,9 @@ trait ReadOnlyTrait {
  * @method restore
  *
  */
-  public function restore(){
-    $class = get_called_class();
-    throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+  public function restore()
+  {
+      ReadOnlyTrait::readOnly(get_called_class());
   }
 
 /**
@@ -107,9 +114,9 @@ trait ReadOnlyTrait {
  * @method forceDelete
  *
  */
-  public function forceDelete(){
-    $class = get_called_class();
-    throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+  public function forceDelete()
+  {
+      ReadOnlyTrait::readOnly(get_called_class());
   }
 
   /**
@@ -117,9 +124,9 @@ trait ReadOnlyTrait {
    * @method performDeleteOnModel
    *
    */
-    public function performDeleteOnModel(){
-      $class = get_called_class();
-      throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+    public function performDeleteOnModel()
+    {
+        ReadOnlyTrait::readOnly(get_called_class());
     }
 
   /**
@@ -127,9 +134,9 @@ trait ReadOnlyTrait {
    * @method push
    *
    */
-    public function push(){
-      $class = get_called_class();
-      throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+    public function push()
+    {
+        ReadOnlyTrait::readOnly(get_called_class());
     }
 
   /**
@@ -137,9 +144,9 @@ trait ReadOnlyTrait {
    * @method finishSave
    *
    */
-    public function finishSave(array $options){
-      $class = get_called_class();
-      throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+    public function finishSave(array $options)
+    {
+        ReadOnlyTrait::readOnly(get_called_class());
     }
 
   /**
@@ -147,9 +154,9 @@ trait ReadOnlyTrait {
    * @method performUpdate
    *
    */
-    public function performUpdate(Builder $query, array $options = []){
-      $class = get_called_class();
-      throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+    public function performUpdate(Builder $query, array $options = [])
+    {
+        ReadOnlyTrait::readOnly(get_called_class());
     }
 
   /**
@@ -157,28 +164,28 @@ trait ReadOnlyTrait {
    * @method touch
    *
    */
-    public function touch(){
-      $class = get_called_class();
-      throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+    public function touch()
+    {
+        ReadOnlyTrait::readOnly(get_called_class());
     }
-  
+
    /**
    * throws ReadOnlyException on insert
    * @method insert
    *
    */
-    public function insert(){
-      $class = get_called_class();
-      throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+    public function insert()
+    {
+        ReadOnlyTrait::readOnly(get_called_class());
     }
-    
+
     /**
    * throws ReadOnlyException on truncate
    * @method truncate
    *
    */
-    public function truncate(){
-      $class = get_called_class();
-      throw new ReadOnlyException("Not allowed to persist changes in read-only model {$class}");
+    public function truncate()
+    {
+        ReadOnlyTrait::readOnly(get_called_class());
     }
 }