diff --git a/.styleci.yml b/.styleci.yml
new file mode 100644
index 0000000..b46b01d
--- /dev/null
+++ b/.styleci.yml
@@ -0,0 +1 @@
+preset: psr2
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a967ce..1862cfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All Notable changes to `Spark Plug` will be documented in this file.
 
+## [0.4.4](https://github.com/rougin/spark-plug/compare/v0.4.3...v0.4.4) - 2016-09-10
+
+### Added
+- StyleCI for conforming code to PSR standards
+
 ## [0.4.3](https://github.com/rougin/spark-plug/compare/v0.4.2...v0.4.3) - 2016-05-13
 
 ### Changed
diff --git a/composer.json b/composer.json
index 7107250..b22da9a 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
     "require-dev": {
         "phpunit/phpunit" : "4.*",
         "scrutinizer/ocular": "~1.1",
-        "rougin/codeigniter": "^3.0.0"
+        "rougin/codeigniter": "~3.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Instance.php b/src/Instance.php
index ce60f42..c157f4d 100644
--- a/src/Instance.php
+++ b/src/Instance.php
@@ -6,7 +6,7 @@
  * Instance
  *
  * Creates an instance based on SparkPlug class.
- * 
+ *
  * @package SparkPlug
  * @author  Rougin Royce Gutib <rougingutib@gmail.com>
  */
@@ -14,7 +14,7 @@ class Instance
 {
     /**
      * Creates an instance of CodeIgniter based on the application path.
-     * 
+     *
      * @param  string $appPath
      * @param  array  $server
      * @param  array  $globals
diff --git a/src/SparkPlug.php b/src/SparkPlug.php
index 4832069..2d24d6a 100644
--- a/src/SparkPlug.php
+++ b/src/SparkPlug.php
@@ -11,7 +11,7 @@
  * Spark Plug
  *
  * Returns a CodeIgniter's instance.
- * 
+ *
  * @package SparkPlug
  * @author  Rougin Royce Gutib <rougingutib@gmail.com>
  */
@@ -46,7 +46,7 @@ public function __construct(array &$globals, array $server, $path = '')
 
     /**
      * Returns a CodeIgniter instance.
-     * 
+     *
      * @return \CI_Controller
      */
     public function getCodeIgniter()
@@ -78,21 +78,21 @@ public function getCodeIgniter()
 
     /**
      * Loads the Common and the Base Controller class.
-     * 
+     *
      * @return void
      */
     protected function loadClasses()
     {
         require BASEPATH . 'core/Common.php';
 
-        if ( ! class_exists('CI_Controller')) {
+        if (! class_exists('CI_Controller')) {
             require BASEPATH . 'core/Controller.php';
         }
     }
 
     /**
      * Loads the framework constants.
-     * 
+     *
      * @return void
      */
     protected function loadConstants()
@@ -122,13 +122,13 @@ protected function setCharSet()
 
         ini_set('default_charset', $charset);
 
-        if ( ! defined('MB_ENABLED')) {
+        if (! defined('MB_ENABLED')) {
             define('MB_ENABLED', extension_loaded('mbstring'));
         }
 
         // mbstring.internal_encoding is deprecated starting with PHP 5.6
         // and it's usage triggers E_DEPRECATED messages.
-        if ( ! is_php('5.6') && ! ini_get('mbstring.internal_encoding')) {
+        if (! is_php('5.6') && ! ini_get('mbstring.internal_encoding')) {
             ini_set('mbstring.internal_encoding', $charset);
         }
 
@@ -139,7 +139,7 @@ protected function setCharSet()
 
         // There's an ICONV_IMPL constant, but the PHP manual says that using
         // iconv's predefined constants is "strongly discouraged".
-        if ( ! defined('ICONV_ENABLED')) {
+        if (! defined('ICONV_ENABLED')) {
             define('ICONV_ENABLED', extension_loaded('iconv'));
         }
     }
@@ -157,14 +157,14 @@ protected function setEnvironment()
             $environment = $this->server['CI_ENV'];
         }
 
-        if ( ! defined('ENVIRONMENT')) {
+        if (! defined('ENVIRONMENT')) {
             define('ENVIRONMENT', $environment);
         }
     }
 
     /**
      * Sets up the APPPATH, VENDOR, and BASEPATH constants.
-     * 
+     *
      * @return void
      */
     protected function setPaths()
@@ -177,15 +177,15 @@ protected function setPaths()
             $applicationPath = $this->path . '/application';
         }
 
-        if ( ! defined('APPPATH')) {
+        if (! defined('APPPATH')) {
             define('APPPATH', $applicationPath . '/');
         }
 
-        if ( ! defined('VENDOR')) {
+        if (! defined('VENDOR')) {
             define('VENDOR', $vendorPath . '/');
         }
 
-        if ( ! defined('VIEWPATH')) {
+        if (! defined('VIEWPATH')) {
             define('VIEWPATH', APPPATH . '/views/');
         }
 
@@ -199,7 +199,7 @@ protected function setPaths()
         foreach ($iterator as $file) {
             $core = 'core' . DIRECTORY_SEPARATOR . 'CodeIgniter.php';
 
-            if (strpos($file->getPathname(), $core) !== FALSE) {
+            if (strpos($file->getPathname(), $core) !== false) {
                 $path = str_replace($core, '', $file->getPathname());
 
                 define('BASEPATH', $path);
diff --git a/src/get_instance.php b/src/get_instance.php
index 816edd8..7d76af5 100644
--- a/src/get_instance.php
+++ b/src/get_instance.php
@@ -1,9 +1,9 @@
 <?php
 
-if ( ! function_exists('get_instance')) {
+if (! function_exists('get_instance')) {
     /**
      * Gets an instance of CodeIgniter.
-     * 
+     *
      * @return CI_Controller
      */
     function &get_instance()
diff --git a/tests/SparkPlugTest.php b/tests/SparkPlugTest.php
index 70b8ba9..e0203ae 100644
--- a/tests/SparkPlugTest.php
+++ b/tests/SparkPlugTest.php
@@ -28,7 +28,7 @@ public function setUp()
 
     /**
      * Checks if the CodeIgniter instance is successfully retrieved.
-     * 
+     *
      * @return void
      */
     public function testCodeIgniterInstance()
@@ -38,7 +38,7 @@ public function testCodeIgniterInstance()
 
     /**
      * Checks if the loaded library can be retrieved.
-     * 
+     *
      * @return void
      */
     public function testLoadLibrary()
@@ -50,7 +50,7 @@ public function testLoadLibrary()
 
     /**
      * Checks if the loaded helper can be retrieved.
-     * 
+     *
      * @return void
      */
     public function testLoadHelper()
@@ -62,7 +62,7 @@ public function testLoadHelper()
 
     /**
      * Checks the environment-based configurations.
-     * 
+     *
      * @return void
      */
     public function testEnvironmentConstants()
diff --git a/tests/TestApp/application/config/config.php b/tests/TestApp/application/config/config.php
index 1c144b4..097f540 100644
--- a/tests/TestApp/application/config/config.php
+++ b/tests/TestApp/application/config/config.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -46,7 +46,7 @@
 |
 | WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
 */
-$config['uri_protocol']	= 'REQUEST_URI';
+$config['uri_protocol']    = 'REQUEST_URI';
 
 /*
 |--------------------------------------------------------------------------
@@ -70,7 +70,7 @@
 | than english.
 |
 */
-$config['language']	= 'english';
+$config['language']    = 'english';
 
 /*
 |--------------------------------------------------------------------------
@@ -94,7 +94,7 @@
 | setting this variable to TRUE (boolean).  See the user guide for details.
 |
 */
-$config['enable_hooks'] = FALSE;
+$config['enable_hooks'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -130,7 +130,7 @@
 | Note: This will NOT disable or override the CodeIgniter-specific
 |	autoloading (application/config/autoload.php)
 */
-$config['composer_autoload'] = FALSE;
+$config['composer_autoload'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -179,8 +179,8 @@
 | use segment based URLs.
 |
 */
-$config['allow_get_array'] = TRUE;
-$config['enable_query_strings'] = FALSE;
+$config['allow_get_array'] = true;
+$config['enable_query_strings'] = false;
 $config['controller_trigger'] = 'c';
 $config['function_trigger'] = 'm';
 $config['directory_trigger'] = 'd';
@@ -295,7 +295,7 @@
 |	             of query parameters.
 |
 */
-$config['cache_query_string'] = FALSE;
+$config['cache_query_string'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -361,10 +361,10 @@
 $config['sess_driver'] = 'files';
 $config['sess_cookie_name'] = 'ci_session';
 $config['sess_expiration'] = 7200;
-$config['sess_save_path'] = NULL;
-$config['sess_match_ip'] = FALSE;
+$config['sess_save_path'] = null;
+$config['sess_match_ip'] = false;
 $config['sess_time_to_update'] = 300;
-$config['sess_regenerate_destroy'] = FALSE;
+$config['sess_regenerate_destroy'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -381,11 +381,11 @@
 |       'cookie_httponly') will also affect sessions.
 |
 */
-$config['cookie_prefix']	= '';
-$config['cookie_domain']	= '';
-$config['cookie_path']		= '/';
-$config['cookie_secure']	= FALSE;
-$config['cookie_httponly'] 	= FALSE;
+$config['cookie_prefix']    = '';
+$config['cookie_domain']    = '';
+$config['cookie_path']        = '/';
+$config['cookie_secure']    = false;
+$config['cookie_httponly']    = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -399,7 +399,7 @@
 | (usually \n) and Windows (\r\n).
 |
 */
-$config['standardize_newlines'] = FALSE;
+$config['standardize_newlines'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -413,7 +413,7 @@
 |          for backwards compatibility purposes!
 |
 */
-$config['global_xss_filtering'] = FALSE;
+$config['global_xss_filtering'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -429,11 +429,11 @@
 | 'csrf_regenerate' = Regenerate token on every submission
 | 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
 */
-$config['csrf_protection'] = FALSE;
+$config['csrf_protection'] = false;
 $config['csrf_token_name'] = 'csrf_test_name';
 $config['csrf_cookie_name'] = 'csrf_cookie_name';
 $config['csrf_expire'] = 7200;
-$config['csrf_regenerate'] = TRUE;
+$config['csrf_regenerate'] = true;
 $config['csrf_exclude_uris'] = array();
 
 /*
@@ -456,7 +456,7 @@
 | by the output class.  Do not 'echo' any values with compression enabled.
 |
 */
-$config['compress_output'] = FALSE;
+$config['compress_output'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -483,7 +483,7 @@
 | Note: You need to have eval() enabled for this to work.
 |
 */
-$config['rewrite_short_tags'] = FALSE;
+$config['rewrite_short_tags'] = false;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/tests/TestApp/application/config/constants.php b/tests/TestApp/application/config/constants.php
index 01096c7..a6ceb26 100644
--- a/tests/TestApp/application/config/constants.php
+++ b/tests/TestApp/application/config/constants.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -47,7 +47,7 @@
 | of this setting
 |
 */
-define('SHOW_DEBUG_BACKTRACE', TRUE);
+define('SHOW_DEBUG_BACKTRACE', true);
 
 /*
 |--------------------------------------------------------------------------
diff --git a/tests/TestApp/application/config/database.php b/tests/TestApp/application/config/database.php
index fdb42e3..cc2e6b9 100644
--- a/tests/TestApp/application/config/database.php
+++ b/tests/TestApp/application/config/database.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------
@@ -71,26 +71,26 @@
 | the query builder class.
 */
 $active_group = 'default';
-$query_builder = TRUE;
+$query_builder = true;
 
 $db['default'] = array(
-	'dsn'	=> '',
-	'hostname' => 'sqlite:' . APPPATH . 'databases/test.db',
-	'username' => '',
-	'password' => '',
-	'database' => '',
-	'dbdriver' => 'pdo',
-	'dbprefix' => '',
-	'pconnect' => FALSE,
-	'db_debug' => (ENVIRONMENT !== 'production'),
-	'cache_on' => FALSE,
-	'cachedir' => '',
-	'char_set' => 'utf8',
-	'dbcollat' => 'utf8_general_ci',
-	'swap_pre' => '',
-	'encrypt' => FALSE,
-	'compress' => FALSE,
-	'stricton' => FALSE,
-	'failover' => array(),
-	'save_queries' => TRUE
+    'dsn'    => '',
+    'hostname' => 'sqlite:' . APPPATH . 'databases/test.db',
+    'username' => '',
+    'password' => '',
+    'database' => '',
+    'dbdriver' => 'pdo',
+    'dbprefix' => '',
+    'pconnect' => false,
+    'db_debug' => (ENVIRONMENT !== 'production'),
+    'cache_on' => false,
+    'cachedir' => '',
+    'char_set' => 'utf8',
+    'dbcollat' => 'utf8_general_ci',
+    'swap_pre' => '',
+    'encrypt' => false,
+    'compress' => false,
+    'stricton' => false,
+    'failover' => array(),
+    'save_queries' => true
 );
diff --git a/tests/TestApp/application/config/production/config.php b/tests/TestApp/application/config/production/config.php
index 68e9225..e4f0d59 100644
--- a/tests/TestApp/application/config/production/config.php
+++ b/tests/TestApp/application/config/production/config.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -46,7 +46,7 @@
 |
 | WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
 */
-$config['uri_protocol']	= 'REQUEST_URI';
+$config['uri_protocol']    = 'REQUEST_URI';
 
 /*
 |--------------------------------------------------------------------------
@@ -70,7 +70,7 @@
 | than english.
 |
 */
-$config['language']	= 'english';
+$config['language']    = 'english';
 
 /*
 |--------------------------------------------------------------------------
@@ -94,7 +94,7 @@
 | setting this variable to TRUE (boolean).  See the user guide for details.
 |
 */
-$config['enable_hooks'] = FALSE;
+$config['enable_hooks'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -130,7 +130,7 @@
 | Note: This will NOT disable or override the CodeIgniter-specific
 |	autoloading (application/config/autoload.php)
 */
-$config['composer_autoload'] = TRUE;
+$config['composer_autoload'] = true;
 
 /*
 |--------------------------------------------------------------------------
@@ -179,8 +179,8 @@
 | use segment based URLs.
 |
 */
-$config['allow_get_array'] = TRUE;
-$config['enable_query_strings'] = FALSE;
+$config['allow_get_array'] = true;
+$config['enable_query_strings'] = false;
 $config['controller_trigger'] = 'c';
 $config['function_trigger'] = 'm';
 $config['directory_trigger'] = 'd';
@@ -295,7 +295,7 @@
 |	             of query parameters.
 |
 */
-$config['cache_query_string'] = FALSE;
+$config['cache_query_string'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -361,10 +361,10 @@
 $config['sess_driver'] = 'files';
 $config['sess_cookie_name'] = 'ci_session';
 $config['sess_expiration'] = 7200;
-$config['sess_save_path'] = NULL;
-$config['sess_match_ip'] = FALSE;
+$config['sess_save_path'] = null;
+$config['sess_match_ip'] = false;
 $config['sess_time_to_update'] = 300;
-$config['sess_regenerate_destroy'] = FALSE;
+$config['sess_regenerate_destroy'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -381,11 +381,11 @@
 |       'cookie_httponly') will also affect sessions.
 |
 */
-$config['cookie_prefix']	= '';
-$config['cookie_domain']	= '';
-$config['cookie_path']		= '/';
-$config['cookie_secure']	= FALSE;
-$config['cookie_httponly'] 	= FALSE;
+$config['cookie_prefix']    = '';
+$config['cookie_domain']    = '';
+$config['cookie_path']        = '/';
+$config['cookie_secure']    = false;
+$config['cookie_httponly']    = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -399,7 +399,7 @@
 | (usually \n) and Windows (\r\n).
 |
 */
-$config['standardize_newlines'] = FALSE;
+$config['standardize_newlines'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -413,7 +413,7 @@
 |          for backwards compatibility purposes!
 |
 */
-$config['global_xss_filtering'] = FALSE;
+$config['global_xss_filtering'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -429,11 +429,11 @@
 | 'csrf_regenerate' = Regenerate token on every submission
 | 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
 */
-$config['csrf_protection'] = FALSE;
+$config['csrf_protection'] = false;
 $config['csrf_token_name'] = 'csrf_test_name';
 $config['csrf_cookie_name'] = 'csrf_cookie_name';
 $config['csrf_expire'] = 7200;
-$config['csrf_regenerate'] = TRUE;
+$config['csrf_regenerate'] = true;
 $config['csrf_exclude_uris'] = array();
 
 /*
@@ -456,7 +456,7 @@
 | by the output class.  Do not 'echo' any values with compression enabled.
 |
 */
-$config['compress_output'] = FALSE;
+$config['compress_output'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -483,7 +483,7 @@
 | Note: You need to have eval() enabled for this to work.
 |
 */
-$config['rewrite_short_tags'] = FALSE;
+$config['rewrite_short_tags'] = false;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/tests/TestApp/application/config/production/constants.php b/tests/TestApp/application/config/production/constants.php
index 01096c7..a6ceb26 100644
--- a/tests/TestApp/application/config/production/constants.php
+++ b/tests/TestApp/application/config/production/constants.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -47,7 +47,7 @@
 | of this setting
 |
 */
-define('SHOW_DEBUG_BACKTRACE', TRUE);
+define('SHOW_DEBUG_BACKTRACE', true);
 
 /*
 |--------------------------------------------------------------------------
diff --git a/tests/TestApp/application/config/routes.php b/tests/TestApp/application/config/routes.php
index a98c6d1..c9530ed 100644
--- a/tests/TestApp/application/config/routes.php
+++ b/tests/TestApp/application/config/routes.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------------
@@ -51,4 +51,4 @@
 */
 $route['default_controller'] = 'welcome';
 $route['404_override'] = '';
-$route['translate_uri_dashes'] = FALSE;
+$route['translate_uri_dashes'] = false;
diff --git a/tests/TestApp/application/models/User.php b/tests/TestApp/application/models/User.php
index 7972a1a..639fb40 100644
--- a/tests/TestApp/application/models/User.php
+++ b/tests/TestApp/application/models/User.php
@@ -1,3 +1,5 @@
 <?php
 
-class User extends CI_Model {}
\ No newline at end of file
+class User extends CI_Model
+{
+}
diff --git a/tests/TestApp/application/views/errors/cli/error_404.php b/tests/TestApp/application/views/errors/cli/error_404.php
index 6984b61..6d25be7 100644
--- a/tests/TestApp/application/views/errors/cli/error_404.php
+++ b/tests/TestApp/application/views/errors/cli/error_404.php
@@ -1,8 +1,8 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 echo "\nERROR: ",
-	$heading,
-	"\n\n",
-	$message,
-	"\n\n";
\ No newline at end of file
+    $heading,
+    "\n\n",
+    $message,
+    "\n\n";
diff --git a/tests/TestApp/application/views/errors/cli/error_db.php b/tests/TestApp/application/views/errors/cli/error_db.php
index 2ff43ff..8c5b7c9 100644
--- a/tests/TestApp/application/views/errors/cli/error_db.php
+++ b/tests/TestApp/application/views/errors/cli/error_db.php
@@ -1,8 +1,8 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 echo "\nDatabase error: ",
-	$heading,
-	"\n\n",
-	$message,
-	"\n\n";
\ No newline at end of file
+    $heading,
+    "\n\n",
+    $message,
+    "\n\n";
diff --git a/tests/TestApp/application/views/errors/cli/error_exception.php b/tests/TestApp/application/views/errors/cli/error_exception.php
index efa6a66..821ebff 100644
--- a/tests/TestApp/application/views/errors/cli/error_exception.php
+++ b/tests/TestApp/application/views/errors/cli/error_exception.php
@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
+<?php defined('BASEPATH') or exit('No direct script access allowed'); ?>
 
 An uncaught Exception was encountered
 
@@ -7,15 +7,15 @@
 Filename:    <?php echo $exception->getFile(), "\n"; ?>
 Line Number: <?php echo $exception->getLine(); ?>
 
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === true): ?>
 
 Backtrace:
 <?php	foreach ($exception->getTrace() as $error): ?>
-<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+<?php	    if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
 	File: <?php echo $error['file'], "\n"; ?>
 	Line: <?php echo $error['line'], "\n"; ?>
 	Function: <?php echo $error['function'], "\n\n"; ?>
-<?php		endif ?>
+<?php	    endif ?>
 <?php	endforeach ?>
 
 <?php endif ?>
diff --git a/tests/TestApp/application/views/errors/cli/error_general.php b/tests/TestApp/application/views/errors/cli/error_general.php
index 6984b61..6d25be7 100644
--- a/tests/TestApp/application/views/errors/cli/error_general.php
+++ b/tests/TestApp/application/views/errors/cli/error_general.php
@@ -1,8 +1,8 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 echo "\nERROR: ",
-	$heading,
-	"\n\n",
-	$message,
-	"\n\n";
\ No newline at end of file
+    $heading,
+    "\n\n",
+    $message,
+    "\n\n";
diff --git a/tests/TestApp/application/views/errors/cli/error_php.php b/tests/TestApp/application/views/errors/cli/error_php.php
index 8a24b64..d7ce4dd 100644
--- a/tests/TestApp/application/views/errors/cli/error_php.php
+++ b/tests/TestApp/application/views/errors/cli/error_php.php
@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed'); ?>
+<?php defined('BASEPATH') or exit('No direct script access allowed'); ?>
 
 A PHP Error was encountered
 
@@ -7,15 +7,15 @@
 Filename:    <?php echo $filepath, "\n"; ?>
 Line Number: <?php echo $line; ?>
 
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === true): ?>
 
 Backtrace:
 <?php	foreach (debug_backtrace() as $error): ?>
-<?php		if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+<?php	    if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
 	File: <?php echo $error['file'], "\n"; ?>
 	Line: <?php echo $error['line'], "\n"; ?>
 	Function: <?php echo $error['function'], "\n\n"; ?>
-<?php		endif ?>
+<?php	    endif ?>
 <?php	endforeach ?>
 
 <?php endif ?>
diff --git a/tests/TestApp/application/views/errors/html/error_404.php b/tests/TestApp/application/views/errors/html/error_404.php
index 756ea9d..20e1dfd 100644
--- a/tests/TestApp/application/views/errors/html/error_404.php
+++ b/tests/TestApp/application/views/errors/html/error_404.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 ?><!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/tests/TestApp/application/views/errors/html/error_db.php b/tests/TestApp/application/views/errors/html/error_db.php
index f5a43f6..e410c98 100644
--- a/tests/TestApp/application/views/errors/html/error_db.php
+++ b/tests/TestApp/application/views/errors/html/error_db.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 ?><!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/tests/TestApp/application/views/errors/html/error_exception.php b/tests/TestApp/application/views/errors/html/error_exception.php
index 8784886..2e2417b 100644
--- a/tests/TestApp/application/views/errors/html/error_exception.php
+++ b/tests/TestApp/application/views/errors/html/error_exception.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 ?>
 
 <div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
@@ -11,7 +11,7 @@
 <p>Filename: <?php echo $exception->getFile(); ?></p>
 <p>Line Number: <?php echo $exception->getLine(); ?></p>
 
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === true): ?>
 
 	<p>Backtrace:</p>
 	<?php foreach ($exception->getTrace() as $error): ?>
diff --git a/tests/TestApp/application/views/errors/html/error_general.php b/tests/TestApp/application/views/errors/html/error_general.php
index fc3b2eb..f4f4f69 100644
--- a/tests/TestApp/application/views/errors/html/error_general.php
+++ b/tests/TestApp/application/views/errors/html/error_general.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 ?><!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/tests/TestApp/application/views/errors/html/error_php.php b/tests/TestApp/application/views/errors/html/error_php.php
index b146f9c..337fde1 100644
--- a/tests/TestApp/application/views/errors/html/error_php.php
+++ b/tests/TestApp/application/views/errors/html/error_php.php
@@ -1,5 +1,5 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 ?>
 
 <div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
@@ -11,7 +11,7 @@
 <p>Filename: <?php echo $filepath; ?></p>
 <p>Line Number: <?php echo $line; ?></p>
 
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === true): ?>
 
 	<p>Backtrace:</p>
 	<?php foreach (debug_backtrace() as $error): ?>