diff --git a/code/CodeBankRedirecter.php b/code/CodeBankRedirecter.php
index 676a57d..76cbdb6 100644
--- a/code/CodeBankRedirecter.php
+++ b/code/CodeBankRedirecter.php
@@ -1,9 +1,10 @@
-<?php
-class CodeBankRedirecter extends Controller {
-    public function init() {
-        parent::init();
-        
-        $this->redirect('admin');
-    }
-}
-?>
\ No newline at end of file
+<?php
+class CodeBankRedirecter extends Controller
+{
+    public function init()
+    {
+        parent::init();
+        
+        $this->redirect('admin');
+    }
+}
diff --git a/code/amf/CodeBankAdministration.php b/code/amf/CodeBankAdministration.php
index 55d2a9e..1342ef5 100644
--- a/code/amf/CodeBankAdministration.php
+++ b/code/amf/CodeBankAdministration.php
@@ -1,14 +1,16 @@
 <?php
-class CodeBankAdministration implements CodeBank_APIClass {
+class CodeBankAdministration implements CodeBank_APIClass
+{
     /**
      * Gets a list of users in the database
      * @return {array} Returns a standard response array
      */
-    public function getUsersList() {
+    public function getUsersList()
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         $members=Permission::get_members_by_permission(array('ADMIN', 'CODE_BANK_ACCESS'));
-        foreach($members as $member) {
+        foreach ($members as $member) {
             $response['data'][]=array(
                                     'id'=>$member->ID,
                                     'username'=>$member->Email,
@@ -25,18 +27,19 @@ public function getUsersList() {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Returns a standard response array
      */
-    public function deleteUser($data) {
+    public function deleteUser($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         try {
             $member=Member::get()->filter('ID', intval($data->id))->filter('ID:not', Member::currentUserID())->First();
-            if(!empty($member) && $member!==false && $member->ID!=0) {
+            if (!empty($member) && $member!==false && $member->ID!=0) {
                 $member->delete();
             }
             
             $response['status']='HELO';
             $response['message']=_t('CodeBankAPI.USER_DELETED', '_User deleted successfully');
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.SERVER_ERROR', '_Server error has occured, please try again later');
         }
@@ -49,19 +52,20 @@ public function deleteUser($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Returns a standard response array
      */
-    public function changeUserPassword($data) {
+    public function changeUserPassword($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         try {
             $member=Member::get()->byID(intval($data->id));
-            if(empty($member) || $member===false || $member->ID==0) {
+            if (empty($member) || $member===false || $member->ID==0) {
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.MEMBER_NOT_FOUND', '_Member not found');
                 
                 return $response;
             }
             
-            if(!$member->changePassword($data->password)) {
+            if (!$member->changePassword($data->password)) {
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.NEW_PASSWORD_NOT_VALID', '_New password is not valid');
                 
@@ -71,7 +75,7 @@ public function changeUserPassword($data) {
             
             $response['status']='HELO';
             $response['message']=_t('CodeBankAPI.PASSWORD_CHANGED', '_User\'s password changed successfully');
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.SERVER_ERROR', '_Server error has occured, please try again later');
         }
@@ -84,11 +88,12 @@ public function changeUserPassword($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Returns a standard response array
      */
-    public function createUser($data) {
+    public function createUser($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         try {
-            if(Member::get()->filter('Email', Convert::raw2sql($data->username))->count()>0) {
+            if (Member::get()->filter('Email', Convert::raw2sql($data->username))->count()>0) {
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.EMAIL_EXISTS', '_An account with that email already exists');
                 
@@ -104,7 +109,7 @@ public function createUser($data) {
             $member->Password=$data->Password;
             $member->UseHeartbeat=0;
             
-            if(!$member->validate()) {
+            if (!$member->validate()) {
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.PASSWORD_NOT_VALID', '_Password is not valid');
                 
@@ -116,7 +121,7 @@ public function createUser($data) {
             
             $response['status']='HELO';
             $response['message']="User added successfully";
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.SERVER_ERROR', '_Server error has occured, please try again later');
         }
@@ -128,11 +133,12 @@ public function createUser($data) {
      * Gets the list of languages with snippet counts
      * @return {array} Standard response base
      */
-    public function getAdminLanguages() {
+    public function getAdminLanguages()
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         $languages=SnippetLanguage::get();
-        foreach($languages as $lang) {
+        foreach ($languages as $lang) {
             $response['data'][]=array(
                                     'id'=>$lang->ID,
                                     'language'=>$lang->Name,
@@ -153,11 +159,12 @@ public function getAdminLanguages() {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Returns a standard response array
      */
-    public function createLanguage($data) {
+    public function createLanguage($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         try {
-            if(SnippetLanguage::get()->filter('Name:nocase', Convert::raw2sql($data->language))->Count()>0) {
+            if (SnippetLanguage::get()->filter('Name:nocase', Convert::raw2sql($data->language))->Count()>0) {
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.LANGUAGE_EXISTS', '_Language already exists');
                 
@@ -175,7 +182,7 @@ public function createLanguage($data) {
             
             $response['status']='HELO';
             $response['message']="Language added successfully";
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.SERVER_ERROR', '_Server error has occured, please try again later');
         }
@@ -188,19 +195,20 @@ public function createLanguage($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Returns a standard response array
      */
-    public function deleteLanguage($data) {
+    public function deleteLanguage($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         try {
             $lang=SnippetLanguage::get()->byID(intval($data->id));
-            if(!empty($lang) && $lang!==false && $lang->ID!=0) {
-                if($lang->canDelete()==false) {
+            if (!empty($lang) && $lang!==false && $lang->ID!=0) {
+                if ($lang->canDelete()==false) {
                     $response['status']='EROR';
                     $response['message']=_t('CodeBankAPI.LANGUAGE_DELETE_ERROR', '_Language cannot be deleted, it is either not a user language or has snippets attached to it');
                     
                     return $response;
                 }
-            }else {
+            } else {
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.LANGUAGE_NOT_FOUND', '_Language not found');
                 
@@ -213,7 +221,7 @@ public function deleteLanguage($data) {
             
             $response['status']='HELO';
             $response['message']="Language deleted successfully";
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.SERVER_ERROR', '_Server error has occured, please try again later');
         }
@@ -226,11 +234,12 @@ public function deleteLanguage($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Returns a standard response array
      */
-    public function editLanguage($data) {
+    public function editLanguage($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         try {
-            if(SnippetLanguage::get()->filter('Name:nocase', Convert::raw2sql($data->language))->Count()>0) {
+            if (SnippetLanguage::get()->filter('Name:nocase', Convert::raw2sql($data->language))->Count()>0) {
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.LANGUAGE_EXISTS', '_Language already exists');
             
@@ -239,7 +248,7 @@ public function editLanguage($data) {
             
             
             $lang=SnippetLanguage::get()->byID(intval($data->id));
-            if(empty($lang) || $lang===false || $lang->ID==0) {
+            if (empty($lang) || $lang===false || $lang->ID==0) {
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.LANGUAGE_NOT_FOUND', '_Language not found');
                 
@@ -248,7 +257,7 @@ public function editLanguage($data) {
             
             
             //Update language and write
-            if($lang->UserLanguage==true) {
+            if ($lang->UserLanguage==true) {
                 $lang->Name=$data->language;
                 $lang->FileExtension=$data->fileExtension;
             }
@@ -259,7 +268,7 @@ public function editLanguage($data) {
             
             $response['status']='HELO';
             $response['message']="Language edited successfully";
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.SERVER_ERROR', '_Server error has occured, please try again later');
         }
@@ -271,11 +280,11 @@ public function editLanguage($data) {
      * Gets the permissions required to access the class
      * @return {array} Array of permission names to check
      */
-    public function getRequiredPermissions() {
+    public function getRequiredPermissions()
+    {
         return array(
                     'CODE_BANK_ACCESS',
                     'ADMIN'
                 );
     }
 }
-?>
\ No newline at end of file
diff --git a/code/amf/CodeBankServer.php b/code/amf/CodeBankServer.php
index 151c533..aac38d5 100644
--- a/code/amf/CodeBankServer.php
+++ b/code/amf/CodeBankServer.php
@@ -1,10 +1,12 @@
 <?php
-class CodeBankServer implements CodeBank_APIClass {
+class CodeBankServer implements CodeBank_APIClass
+{
     /**
      * Gets the ip message
      * @return {array} Standard response base
      */
-    public function getIPMessage() {
+    public function getIPMessage()
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         $response['data']=CodeBankConfig::CurrentConfig()->IPMessage;
@@ -17,10 +19,11 @@ public function getIPMessage() {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Returns a standard response array
      */
-    public function saveIPMessage($data) {
+    public function saveIPMessage($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
-        if(!Permission::check('ADMIN')) {
+        if (!Permission::check('ADMIN')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             return $response;
@@ -35,7 +38,7 @@ public function saveIPMessage($data) {
             
             $response['status']='HELO';
             $response['message']=_t('CodeBankAPI.IP_MESSAGE_CHANGE', '_Intellectual Property message changed successfully');
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.SERVER_ERROR', '_Server error has occured, please try again later');
         }
@@ -47,7 +50,8 @@ public function saveIPMessage($data) {
      * Handles heartbeat requests
      * @return {array} Standard response base
      */
-    public function heartbeat() {
+    public function heartbeat()
+    {
         return CodeBank_ClientAPI::responseBase();
     }
     
@@ -56,22 +60,23 @@ public function heartbeat() {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function savePreferences($data) {
+    public function savePreferences($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         try {
             $member=Member::currentUser();
-            if($member && $member->ID!=0) {
+            if ($member && $member->ID!=0) {
                 $member->UseHeartbeat=($data->heartbeat==1 ? true:false);
                 $member->write();
-            }else {
+            } else {
                 throw new Exception('Not Logged In!');
             }
             
             
             $response['status']='HELO';
             $response['message']=_t('CodeBankAPI.PREFERENCES_SAVED', '_Preferences saved successfully');
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.SERVER_ERROR', '_Server error has occured, please try again later');
         }
@@ -84,14 +89,15 @@ public function savePreferences($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Returns a standard response array
      */
-    public function changePassword($data) {
+    public function changePassword($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         try {
             $member=Member::currentUser();
             
             $e=PasswordEncryptor::create_for_algorithm($member->PasswordEncryption);
-            if(!$e->check($member->Password, $data->currPassword, $member->Salt, $member)) {
+            if (!$e->check($member->Password, $data->currPassword, $member->Salt, $member)) {
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.CURRENT_PASSWORD_MATCH', '_Current password does not match');
                 
@@ -99,7 +105,7 @@ public function changePassword($data) {
             }
             
             
-            if(!$member->changePassword($data->password)) {
+            if (!$member->changePassword($data->password)) {
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.NEW_PASSWORD_NOT_VALID', '_New password is not valid');
                 
@@ -109,7 +115,7 @@ public function changePassword($data) {
             
             $response['status']='HELO';
             $response['message']=_t('CodeBankAPI.PASSWORD_CHANGED', '_User\'s password changed successfully');
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.SERVER_ERROR', '_Server error has occured, please try again later');
         }
@@ -121,16 +127,19 @@ public function changePassword($data) {
      * Gets the permissions required to access the class
      * @return {array} Array of permission names to check
      */
-    public function getRequiredPermissions() {
+    public function getRequiredPermissions()
+    {
         return array(
                     'CODE_BANK_ACCESS'
                 );
     }
 }
 
-class CodeBankServerController implements CodeBank_APIClass {
+class CodeBankServerController implements CodeBank_APIClass
+{
     
-    public function connect() {
+    public function connect()
+    {
         $response=CodeBank_ClientAPI::responseBase();
     
         $response['login']=true;
@@ -141,7 +150,8 @@ public function connect() {
     /**
      * Gets the current php session id
      */
-    public function getSessionId() {
+    public function getSessionId()
+    {
         $response=CodeBank_ClientAPI::responseBase();
     
         $response['data']=session_id();
@@ -153,8 +163,8 @@ public function getSessionId() {
      * Gets the permissions required to access the class
      * @return {array} Array of permission names to check
      */
-    public function getRequiredPermissions() {
+    public function getRequiredPermissions()
+    {
         return null;
     }
 }
-?>
\ No newline at end of file
diff --git a/code/amf/CodeBankSessionManager.php b/code/amf/CodeBankSessionManager.php
index 8d9a030..78f7bb5 100644
--- a/code/amf/CodeBankSessionManager.php
+++ b/code/amf/CodeBankSessionManager.php
@@ -1,11 +1,13 @@
 <?php
-class CodeBankSessionManager implements CodeBank_APIClass {
+class CodeBankSessionManager implements CodeBank_APIClass
+{
     /**
      * Attempt to login
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Returns a standard response array
      */
-    public function login($data) {
+    public function login($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         $response['login']=true;
@@ -16,7 +18,7 @@ public function login($data) {
                                                         'Password'=>$data->pass
                                                     ));
         
-        if($member instanceof Member && $member->ID!=0 && Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+        if ($member instanceof Member && $member->ID!=0 && Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             try {
                 $member->logIn();
                 
@@ -37,12 +39,12 @@ public function login($data) {
                                         'isAdmin'=>(Permission::check('ADMIN')!==false),
                                         'displayName'=>(trim($member->Name)=='' ? $member->Email:trim($member->Name))
                                     );
-            }catch (Exception $e) {
+            } catch (Exception $e) {
                 //Something happend on the server
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.SERVER_ERROR', '_Server error has occured, please try again later');
             }
-        }else {
+        } else {
             //Bad username/pass combo
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.INVALID_LOGIN', '_Invalid Login');
@@ -56,14 +58,15 @@ public function login($data) {
      * Closes the users session
      * @return {array} Default response base
      */
-    public function logout() {
+    public function logout()
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Session now expired
         $response['session']='expired';
         
         $member=Member::currentUser();
-        if($member) {
+        if ($member) {
             $member->logOut();
         }
         
@@ -75,53 +78,54 @@ public function logout() {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Returns a standard response array
      */
-    public function lostPassword($data) {
+    public function lostPassword($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         $response['login']=true;
         
         
-		$SQL_email=Convert::raw2sql($data->user);
-		$member=Member::get_one('Member', "\"Email\"='{$SQL_email}'");
+        $SQL_email=Convert::raw2sql($data->user);
+        $member=Member::get_one('Member', "\"Email\"='{$SQL_email}'");
 
-		// Allow vetoing forgot password requests
-		$sng=new MemberLoginForm(Controller::has_curr() ? Controller::curr():singleton('Controller'), 'LoginForm');
-		$results=$sng->extend('forgotPassword', $member);
-		if($results && is_array($results) && in_array(false, $results, true)) {
-		    $response['status']='HELO';
-			$response['message']=_t('CodeBankAPI.PASSWORD_SENT_TEXT', "A reset link has been sent to '{email}', provided an account exists for this email address.", array('email'=>$data['Email']));
-		}
+        // Allow vetoing forgot password requests
+        $sng=new MemberLoginForm(Controller::has_curr() ? Controller::curr():singleton('Controller'), 'LoginForm');
+        $results=$sng->extend('forgotPassword', $member);
+        if ($results && is_array($results) && in_array(false, $results, true)) {
+            $response['status']='HELO';
+            $response['message']=_t('CodeBankAPI.PASSWORD_SENT_TEXT', "A reset link has been sent to '{email}', provided an account exists for this email address.", array('email'=>$data['Email']));
+        }
 
-		if($member) {
-			$token=$member->generateAutologinTokenAndStoreHash();
+        if ($member) {
+            $token=$member->generateAutologinTokenAndStoreHash();
 
-			$e=Member_ForgotPasswordEmail::create();
-			$e->populateTemplate($member);
-			$e->populateTemplate(array(
-				'PasswordResetLink'=>Security::getPasswordResetLink($member, $token)
-			));
-			$e->setTo($member->Email);
-			$e->send();
+            $e=Member_ForgotPasswordEmail::create();
+            $e->populateTemplate($member);
+            $e->populateTemplate(array(
+                'PasswordResetLink'=>Security::getPasswordResetLink($member, $token)
+            ));
+            $e->setTo($member->Email);
+            $e->send();
 
-			$response['status']='HELO';
-			$response['message']=_t('CodeBankAPI.PASSWORD_SENT_TEXT', "A reset link has been sent to '{email}', provided an account exists for this email address.", array('email'=>$data->user));
-		}else if(!empty($data->user)) {
-			$response['status']='HELO';
-			$response['message']=_t('CodeBankAPI.PASSWORD_SENT_TEXT', "A reset link has been sent to '{email}', provided an account exists for this email address.", array('email'=>$data->user));
-		}else {
-			$response['status']='EROR';
-			$response['message']=_t('Member.ENTEREMAIL', 'Please enter an email address to get a password reset link.');
-		}
-		
-		
-		return $response;
+            $response['status']='HELO';
+            $response['message']=_t('CodeBankAPI.PASSWORD_SENT_TEXT', "A reset link has been sent to '{email}', provided an account exists for this email address.", array('email'=>$data->user));
+        } elseif (!empty($data->user)) {
+            $response['status']='HELO';
+            $response['message']=_t('CodeBankAPI.PASSWORD_SENT_TEXT', "A reset link has been sent to '{email}', provided an account exists for this email address.", array('email'=>$data->user));
+        } else {
+            $response['status']='EROR';
+            $response['message']=_t('Member.ENTEREMAIL', 'Please enter an email address to get a password reset link.');
+        }
+        
+        
+        return $response;
     }
     
     /**
      * Gets the permissions required to access the class
      * @return {array} Array of permission names to check
      */
-    public function getRequiredPermissions() {
+    public function getRequiredPermissions()
+    {
         return null;
     }
 }
-?>
\ No newline at end of file
diff --git a/code/amf/CodeBankSnippets.php b/code/amf/CodeBankSnippets.php
index 85d6da7..8543ace 100644
--- a/code/amf/CodeBankSnippets.php
+++ b/code/amf/CodeBankSnippets.php
@@ -1,14 +1,16 @@
 <?php
-class CodeBankSnippets implements CodeBank_APIClass {
+class CodeBankSnippets implements CodeBank_APIClass
+{
     /**
      * Gets the list of languages
      * @return {array} Standard response base
      */
-    public function getLanguages() {
+    public function getLanguages()
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -19,8 +21,8 @@ public function getLanguages() {
         $languages=SnippetLanguage::get();
         $response['data']=array();
         
-        foreach($languages as $lang) {
-            if($lang->Hidden && $lang->Snippets()->Count()==0) {
+        foreach ($languages as $lang) {
+            if ($lang->Hidden && $lang->Snippets()->Count()==0) {
                 continue;
             }
             
@@ -40,11 +42,12 @@ public function getLanguages() {
      * Gets a list of snippets in an array of languages
      * @return {array} Standard response base
      */
-    public function getSnippets() {
+    public function getSnippets()
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -53,8 +56,8 @@ public function getSnippets() {
         
         
         $languages=SnippetLanguage::get();
-        foreach($languages as $lang) {
-            if($lang->Snippets()->Count()>0) {
+        foreach ($languages as $lang) {
+            if ($lang->Snippets()->Count()>0) {
                 $snippets=$this->overviewList($lang->Snippets()->filter('FolderID', 0), 'Title', 'ID', 'LanguageID');
                 
                 $response['data'][]=array(
@@ -76,27 +79,28 @@ public function getSnippets() {
      * @param {string} $searchQuery Search Query
      * @return {array} Nested array of folder data
      */
-    private function mapFolders(SS_List $folders, $searchQuery=null) {
+    private function mapFolders(SS_List $folders, $searchQuery=null)
+    {
         $result=array();
         
-        foreach($folders as $folder) {
-            if(!empty($searchQuery) && $searchQuery!==false) {
+        foreach ($folders as $folder) {
+            if (!empty($searchQuery) && $searchQuery!==false) {
                 $searchEngine=Config::inst()->get('CodeBank', 'snippet_search_engine');
-                if($searchEngine && class_exists($searchEngine) && in_array('ICodeBankSearchEngine', class_implements($searchEngine))) {
+                if ($searchEngine && class_exists($searchEngine) && in_array('ICodeBankSearchEngine', class_implements($searchEngine))) {
                     $searchEngine=new $searchEngine();
-                }else {
+                } else {
                     //Class is missing or invalid so fallback to the default
                     $searchEngine=new DefaultCodeBankSearchEngine();
                 }
                 
                 $snippets=$searchEngine->doSnippetSearch($searchQuery, false, $folder->ID);
-            }else {
+            } else {
                 $snippets=$folder->Snippets();
             }
             
             $snippets=$this->overviewList($snippets, 'Title', 'ID', 'LanguageID');
             
-            if(!empty($searchQuery) && $searchQuery!==false && count($snippets)==0) {
+            if (!empty($searchQuery) && $searchQuery!==false && count($snippets)==0) {
                 continue;
             }
             
@@ -117,11 +121,12 @@ private function mapFolders(SS_List $folders, $searchQuery=null) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function getSnippetsByLanguage($data) {
+    public function getSnippetsByLanguage($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -130,7 +135,7 @@ public function getSnippetsByLanguage($data) {
         
         
         $lang=SnippetLanguage::get()->byID(intval($data->id));
-        if(!empty($lang) && $lang!==false && $lang->ID!=0 && $lang->Snippets()->Count()>0) {
+        if (!empty($lang) && $lang!==false && $lang->ID!=0 && $lang->Snippets()->Count()>0) {
             $snippets=$this->arrayUnmap($lang->Snippets()->filter('FolderID', 0)->map('ID', 'Title')->toArray());
             $response['data'][]=array(
                                     'id'=>$lang->ID,
@@ -149,11 +154,12 @@ public function getSnippetsByLanguage($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function searchSnippets($data) {
+    public function searchSnippets($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -162,11 +168,11 @@ public function searchSnippets($data) {
         
         
         $languages=SnippetLanguage::get();
-        foreach($languages as $lang) {
+        foreach ($languages as $lang) {
             $searchEngine=Config::inst()->get('CodeBank', 'snippet_search_engine');
-            if($searchEngine && class_exists($searchEngine) && in_array('ICodeBankSearchEngine', class_implements($searchEngine))) {
+            if ($searchEngine && class_exists($searchEngine) && in_array('ICodeBankSearchEngine', class_implements($searchEngine))) {
                 $searchEngine=new $searchEngine();
-            }else {
+            } else {
                 //Class is missing or invalid so fallback to the default
                 $searchEngine=new DefaultCodeBankSearchEngine();
             }
@@ -174,7 +180,7 @@ public function searchSnippets($data) {
             $snippets=$searchEngine->doSnippetSearch($data->query, $lang->ID);
             
             
-            if($snippets->Count()>0) {
+            if ($snippets->Count()>0) {
                 $snippets=$this->arrayUnmap($snippets->filter('FolderID', 0)->map('ID', 'Title')->toArray());
                 $response['data'][]=array(
                                         'id'=>$lang->ID,
@@ -194,11 +200,12 @@ public function searchSnippets($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function getSnippetInfo($data) {
+    public function getSnippetInfo($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -207,9 +214,9 @@ public function getSnippetInfo($data) {
         
         
         $snippet=Snippet::get()->byID($data->id);
-        if(!empty($snippet) && $snippet!==false && $snippet->ID!=0) {
+        if (!empty($snippet) && $snippet!==false && $snippet->ID!=0) {
             $packageDetails=null;
-            if($snippet->Package()) {
+            if ($snippet->Package()) {
                 $packageDetails=array(
                                         'id'=>$snippet->Package()->ID,
                                         'title'=>$snippet->Package()->Title,
@@ -236,7 +243,7 @@ public function getSnippetInfo($data) {
                                 );
             
             $snippetScript='<script type="text/javascript" src="app:/tools/external/syntaxhighlighter/brushes/shBrush'.$response['data'][0]['shjs_code'].'.js"></script>';
-            if($snippet->Language()->UserLanguage==true && !empty($snippet->Language()->BrushFile)) {
+            if ($snippet->Language()->UserLanguage==true && !empty($snippet->Language()->BrushFile)) {
                 $snippetScript="<script type=\"text/javascript\">\n".@file_get_contents(Director::baseFolder().'/'.$snippet->Language()->BrushFile)."\n</script>";
             }
             
@@ -260,10 +267,10 @@ public function getSnippetInfo($data) {
                                                     '</body>'.
                                                  '</html>';
             
-            if($response['data'][0]['language']=='ActionScript 3') {
+            if ($response['data'][0]['language']=='ActionScript 3') {
                 $response['data'][0]['fileType']='zip';
             }
-        }else {
+        } else {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.SNIPPET_NOT_FOUND', '_Snippet not found');
         }
@@ -277,11 +284,12 @@ public function getSnippetInfo($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function getSnippetRevisions($data) {
+    public function getSnippetRevisions($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -290,18 +298,18 @@ public function getSnippetRevisions($data) {
         
         
         $snippet=Snippet::get()->byID($data->id);
-        if(!empty($snippet) && $snippet!==false && $snippet->ID!=0) {
+        if (!empty($snippet) && $snippet!==false && $snippet->ID!=0) {
             $revisions=$snippet->Versions()->map('ID', 'Created');
             
             $i=0;
-            foreach($revisions as $id=>$date) {
+            foreach ($revisions as $id=>$date) {
                 $response['data'][]=array(
                                         'id'=>$id,
                                         'date'=>($i==0 ? '{Current Revision}':$date)
                                     );
                 $i++;
             }
-        }else {
+        } else {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.SNIPPET_NOT_FOUND', '_Snippet not found');
         }
@@ -314,11 +322,12 @@ public function getSnippetRevisions($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function getSnippetTextFromRevision($data) {
+    public function getSnippetTextFromRevision($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -327,11 +336,11 @@ public function getSnippetTextFromRevision($data) {
         
         
         $revision=SnippetVersion::get()->byID(intval($data->id));
-        if(!empty($revision) && $revision!==false && $revision->ID!=0) {
+        if (!empty($revision) && $revision!==false && $revision->ID!=0) {
             $lang=$revision->Parent()->Language();
             
             $snippetScript='<script type="text/javascript" src="app:/tools/external/syntaxhighlighter/brushes/shBrush'.$lang->HighlightCode.'.js"></script>';
-            if($lang->UserLanguage==true && !empty($lang->BrushFile)) {
+            if ($lang->UserLanguage==true && !empty($lang->BrushFile)) {
                 $snippetScript="<script type=\"text/javascript\">\n".@file_get_contents(Director::baseFolder().'/'.$lang->BrushFile)."\n</script>";
             }
             
@@ -352,7 +361,7 @@ public function getSnippetTextFromRevision($data) {
                                         '<pre class="brush: '.strtolower($lang->HighlightCode).'" style="font-size:10pt;">'.htmlentities(preg_replace('/\r\n|\n|\r/', "\n", $revision->Text), null, 'UTF-8').'</pre>'.
                                     '</body>'.
                                  '</html>';
-        }else {
+        } else {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.REVISION_NOT_FOUND', '_Revision not found');
         }
@@ -367,11 +376,12 @@ public function getSnippetTextFromRevision($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function newSnippet($data) {
+    public function newSnippet($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -389,15 +399,15 @@ public function newSnippet($data) {
             $snippet->CreatorID=Member::currentUserID();
             $snippet->PackageID=$data->packageID;
             
-            if($data->folderID>0) {
+            if ($data->folderID>0) {
                 $folder=SnippetFolder::get()->byID(intval($data->folderID));
-                if(empty($folder) || $folder===false || $folder->ID==0) {
+                if (empty($folder) || $folder===false || $folder->ID==0) {
                     $response['status']="EROR";
                     $response['message']=_t('CodeBankAPI.FOLDER_DOES_NOT_EXIST', '_Folder does not exist');
                     return $response;
                 }
                 
-                if($folder->LanguageID!=$snippet->LanguageID) {
+                if ($folder->LanguageID!=$snippet->LanguageID) {
                     $response['status']="EROR";
                     $response['message']=_t('CodeBankAPI.FOLDER_NOT_LANGUAGE', '_Folder is not in the same language as the snippet');
                     return $response;
@@ -408,7 +418,7 @@ public function newSnippet($data) {
             
             
             $response['status']="HELO";
-        }catch(Exception $e) {
+        } catch (Exception $e) {
             $response['status']="EROR";
             $response['message']="Internal Server error occured";
         }
@@ -422,11 +432,12 @@ public function newSnippet($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function saveSnippet($data) {
+    public function saveSnippet($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -436,23 +447,23 @@ public function saveSnippet($data) {
         
         try {
             $snippet=Snippet::get()->byID(intval($data->id));
-            if(!empty($snippet) && $snippet!==false && $snippet->ID!=0) {
+            if (!empty($snippet) && $snippet!==false && $snippet->ID!=0) {
                 $snippet->Title=$data->title;
                 $snippet->Description=$data->description;
                 $snippet->Text=$data->code;
                 $snippet->Tags=$data->tags;
                 
                 //Ensure we're not assigning to another hidden language
-                if($snippet->LanguageID!=$data->language) {
+                if ($snippet->LanguageID!=$data->language) {
                     $lang=SnippetLanguage::get()->byID(intval($data->language));
-                    if(!empty($lang) && $lang!==false && $lang->ID>0) {
-                        if($lang->Hidden) {
+                    if (!empty($lang) && $lang!==false && $lang->ID>0) {
+                        if ($lang->Hidden) {
                             $response['status']='EROR';
                             $response['message']=_t('CodeBankAPI.LANGUAGE_HIDDEN', '_You cannot assign this snippet to a hidden language');
                             
                             return $response;
                         }
-                    }else {
+                    } else {
                         throw new Exception('Language not found');
                     }
                 }
@@ -464,11 +475,11 @@ public function saveSnippet($data) {
                 
                 
                 $response['status']='HELO';
-            }else {
+            } else {
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.SNIPPET_NOT_FOUND', '_Snippet not found');
             }
-        }catch(Exception $e) {
+        } catch (Exception $e) {
             $response['status']="EROR";
             $response['message']="Internal Server error occured";
         }
@@ -482,13 +493,14 @@ public function saveSnippet($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function deleteSnippet($data) {
+    public function deleteSnippet($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         try {
             $snippet=Snippet::get()->byID(intval($data->id));
-            if(!empty($snippet) && $snippet!==false && $snippet->ID!=0) {
-                if($snippet->canDelete()==false) {
+            if (!empty($snippet) && $snippet!==false && $snippet->ID!=0) {
+                if ($snippet->canDelete()==false) {
                     $response['status']="EROR";
                     $response['message']="Not authorized";
                     
@@ -501,11 +513,11 @@ public function deleteSnippet($data) {
                 
                 
                 $response['status']='HELO';
-            }else {
+            } else {
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.SNIPPET_NOT_FOUND', '_Snippet not found');
             }
-        }catch(Exception $e) {
+        } catch (Exception $e) {
             $response['status']="EROR";
             $response['message']="Internal Server error occured";
         }
@@ -518,13 +530,14 @@ public function deleteSnippet($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function getSnippetDiff($data) {
+    public function getSnippetDiff($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         
         //Get the Main Revision
         $snippet1=SnippetVersion::get()->byID(intval($data->mainRev));
-        if(empty($snippet1) || $snippet1===false || $snippet1->ID==0) {
+        if (empty($snippet1) || $snippet1===false || $snippet1->ID==0) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.MAIN_REVISION_NOT_FOUND', '_Main revision not found');
         
@@ -536,7 +549,7 @@ public function getSnippetDiff($data) {
         
         //Get the Comparision Revision
         $snippet2=SnippetVersion::get()->byID(intval($data->compRev));
-        if(empty($snippet2) || $snippet1===false || $snippet2->ID==0) {
+        if (empty($snippet2) || $snippet1===false || $snippet2->ID==0) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.COMPARE_REVISION_NOT_FOUND', '_Compare revision not found');
         
@@ -560,11 +573,12 @@ public function getSnippetDiff($data) {
      * Gets the list of packages
      * @return {array} Standard response base
      */
-    public function getPackages() {
+    public function getPackages()
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -583,11 +597,12 @@ public function getPackages() {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function getPackageInfo($data) {
+    public function getPackageInfo($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
         
@@ -596,7 +611,7 @@ public function getPackageInfo($data) {
         
         
         $package=SnippetPackage::get()->byID(intval($data->id));
-        if(!empty($package) && $package!==false && $package->ID!=0) {
+        if (!empty($package) && $package!==false && $package->ID!=0) {
             $response['data']=array(
                                     'id'=>$package->ID,
                                     'title'=>$package->Title,
@@ -605,7 +620,7 @@ public function getPackageInfo($data) {
             
             
             $response['status']='HELO';
-        }else {
+        } else {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PACKAGE_NOT_FOUND', '_Package not found');
         }
@@ -618,11 +633,12 @@ public function getPackageInfo($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function packageRemoveSnippet($data) {
+    public function packageRemoveSnippet($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
         
@@ -631,12 +647,12 @@ public function packageRemoveSnippet($data) {
         
         
         $package=SnippetPackage::get()->byID(intval($data->packageID));
-        if(!empty($package) && $package!==false && $package->ID!=0) {
+        if (!empty($package) && $package!==false && $package->ID!=0) {
             $package->Snippets()->removeByID(intval($data->snippetID));
             
             
             $response['status']='HELO';
-        }else {
+        } else {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PACKAGE_NOT_FOUND', '_Package not found');
         }
@@ -649,11 +665,12 @@ public function packageRemoveSnippet($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function findSnippetAutoComplete($data) {
+    public function findSnippetAutoComplete($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
         
@@ -676,11 +693,12 @@ public function findSnippetAutoComplete($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function addSnippetToPackage($data) {
+    public function addSnippetToPackage($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -689,20 +707,20 @@ public function addSnippetToPackage($data) {
         
         
         $package=SnippetPackage::get()->byID(intval($data->packageID));
-        if(!empty($package) && $package!==false && $package->ID!=0) {
+        if (!empty($package) && $package!==false && $package->ID!=0) {
             $snippet=Snippet::get()->byID(intval($data->snippetID));
-            if(!empty($snippet) && $snippet!==false && $snippet->ID!=0) {
+            if (!empty($snippet) && $snippet!==false && $snippet->ID!=0) {
                 $package->Snippets()->add($snippet);
                 
                 
                 $response['status']='HELO';
-            }else {
+            } else {
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.SNIPPET_NOT_FOUND', '_Snippet not found');
             }
             
             $response['status']='HELO';
-        }else {
+        } else {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PACKAGE_NOT_FOUND', '_Package not found');
         }
@@ -716,11 +734,12 @@ public function addSnippetToPackage($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function savePackage($data) {
+    public function savePackage($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
         
@@ -729,18 +748,18 @@ public function savePackage($data) {
         
         
         $package=SnippetPackage::get()->byID(intval($data->packageID));
-        if(!empty($package) && $package!==false && $package->ID!=0) {
-            if(!empty($data->title)) {
+        if (!empty($package) && $package!==false && $package->ID!=0) {
+            if (!empty($data->title)) {
                 $package->Title=$data->title;
                 $package->write();
                 
                 
                 $response['status']='HELO';
-            }else {
+            } else {
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.PACKAGES_TITLE_REQUIRED', '_Packages must have a title');
             }
-        }else {
+        } else {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PACKAGE_NOT_FOUND', '_Package not found');
         }
@@ -753,11 +772,12 @@ public function savePackage($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function createPackage($data) {
+    public function createPackage($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
         
@@ -765,7 +785,7 @@ public function createPackage($data) {
         }
         
         
-        if(!empty($data->title)) {
+        if (!empty($data->title)) {
             $package=new SnippetPackage();
             $package->Title=$data->title;
             $package->write();
@@ -773,7 +793,7 @@ public function createPackage($data) {
             
             $response['status']='HELO';
             $response['data']=$package->ID;
-        }else {
+        } else {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PACKAGES_TITLE_REQUIRED', '_Packages must have a title');
         }
@@ -786,11 +806,12 @@ public function createPackage($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function deletePackage($data) {
+    public function deletePackage($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
         
@@ -799,12 +820,12 @@ public function deletePackage($data) {
         
         
         $package=SnippetPackage::get()->byID(intval($data->id));
-        if(!empty($package) && $package!==false && $package->ID!=0) {
+        if (!empty($package) && $package!==false && $package->ID!=0) {
             $package->delete();
             
             
             $response['status']='HELO';
-        }else {
+        } else {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PACKAGE_NOT_FOUND', '_Package not found');
         }
@@ -817,11 +838,12 @@ public function deletePackage($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function newFolder($data) {
+    public function newFolder($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -829,22 +851,22 @@ public function newFolder($data) {
         }
         
         $language=SnippetLanguage::get()->byID(intval($data->languageID));
-        if(empty($language) || $language===false || $language->ID==0) {
+        if (empty($language) || $language===false || $language->ID==0) {
             $response['status']="EROR";
             $response['message']=_t('CodeBankAPI.LANGUAGE_NOT_FOUND', '_Language not found');
             return $response;
         }
         
         
-        if($data->parentID>0) {
+        if ($data->parentID>0) {
             $folder=SnippetFolder::get()->byID(intval($data->parentID));
-            if(empty($folder) || $folder===false || $folder->ID==0) {
+            if (empty($folder) || $folder===false || $folder->ID==0) {
                 $response['status']="EROR";
                 $response['message']=_t('CodeBankAPI.FOLDER_DOES_NOT_EXIST', '_Folder does not exist');
                 return $response;
             }
             
-            if($folder->LanguageID!=$language->ID) {
+            if ($folder->LanguageID!=$language->ID) {
                 $response['status']="EROR";
                 $response['message']=_t('CodeBankAPI.FOLDER_NOT_LANGUAGE', '_Folder is not in the same language as the snippet');
                 return $response;
@@ -857,7 +879,7 @@ public function newFolder($data) {
         $existingCheck=SnippetFolder::get()->filter('Name:nocase', Convert::raw2sql($data->name))->filter('LanguageID', $language->ID)->filter('ParentID', $data->parentID);
         
         
-        if($existingCheck->Count()>0) {
+        if ($existingCheck->Count()>0) {
             $response['status']="EROR";
             $response['message']=_t('CodeBank.FOLDER_EXISTS', '_A folder already exists with that name');
             return $response;
@@ -873,7 +895,7 @@ public function newFolder($data) {
             
             
             $response['status']="HELO";
-        }catch(Exception $e) {
+        } catch (Exception $e) {
             $response['status']="EROR";
             $response['message']="Internal Server error occured";
         }
@@ -887,11 +909,12 @@ public function newFolder($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function renameFolder($data) {
+    public function renameFolder($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -900,7 +923,7 @@ public function renameFolder($data) {
         
     
         $snippetFolder=SnippetFolder::get()->byID(intval($data->id));
-        if(empty($snippetFolder) || $snippetFolder===false || $snippetFolder->ID==0) {
+        if (empty($snippetFolder) || $snippetFolder===false || $snippetFolder->ID==0) {
             $response['status']="EROR";
             $response['message']=_t('CodeBankAPI.FOLDER_DOES_NOT_EXIST', '_Folder does not exist');
             return $response;
@@ -914,7 +937,7 @@ public function renameFolder($data) {
                                             ->filter('LanguageID', $snippetFolder->LanguageID)
                                             ->filter('ParentID', $snippetFolder->ParentID);
         
-        if($existingCheck->Count()>0) {
+        if ($existingCheck->Count()>0) {
             $response['status']="EROR";
             $response['message']=_t('CodeBank.FOLDER_EXISTS', '_A folder already exists with that name');
             return $response;
@@ -927,7 +950,7 @@ public function renameFolder($data) {
             
             
             $response['status']="HELO";
-        }catch(Exception $e) {
+        } catch (Exception $e) {
             $response['status']="EROR";
             $response['message']="Internal Server error occured";
         }
@@ -941,11 +964,12 @@ public function renameFolder($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function deleteFolder($data) {
+    public function deleteFolder($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -954,7 +978,7 @@ public function deleteFolder($data) {
         
     
         $snippetFolder=SnippetFolder::get()->byID(intval($data->id));
-        if(empty($snippetFolder) || $snippetFolder===false || $snippetFolder->ID==0) {
+        if (empty($snippetFolder) || $snippetFolder===false || $snippetFolder->ID==0) {
             $response['status']="EROR";
             $response['message']=_t('CodeBankAPI.FOLDER_DOES_NOT_EXIST', '_Folder does not exist');
             return $response;
@@ -966,7 +990,7 @@ public function deleteFolder($data) {
             
             
             $response['status']="HELO";
-        }catch(Exception $e) {
+        } catch (Exception $e) {
             $response['status']="EROR";
             $response['message']="Internal Server error occured";
         }
@@ -980,11 +1004,12 @@ public function deleteFolder($data) {
      * @param {stdClass} $data Data passed from ActionScript
      * @return {array} Standard response base
      */
-    public function moveSnippet($data) {
+    public function moveSnippet($data)
+    {
         $response=CodeBank_ClientAPI::responseBase();
         
         //Ensure logged in
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             $response['status']='EROR';
             $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
             
@@ -993,22 +1018,22 @@ public function moveSnippet($data) {
         
         
         $snippet=Snippet::get()->byID(intval($data->id));
-        if(empty($snippet) || $snippet===false || $snippet->ID==0) {
+        if (empty($snippet) || $snippet===false || $snippet->ID==0) {
             $response['status']="EROR";
             $response['message']=_t('CodeBankAPI.SNIPPET_NOT_FOUND', '_Snippet not found');
             return $response;
         }
         
         
-        if($data->folderID!=0) {
+        if ($data->folderID!=0) {
             $snippetFolder=SnippetFolder::get()->byID(intval($data->folderID));
-            if(empty($snippetFolder) || $snippetFolder===false || $snippetFolder->ID==0) {
+            if (empty($snippetFolder) || $snippetFolder===false || $snippetFolder->ID==0) {
                 $response['status']="EROR";
                 $response['message']=_t('CodeBankAPI.FOLDER_DOES_NOT_EXIST', '_Folder does not exist');
                 return $response;
             }
             
-            if($snippetFolder->LanguageID!=$snippet->LanguageID) {
+            if ($snippetFolder->LanguageID!=$snippet->LanguageID) {
                 $response['status']="EROR";
                 $response['message']=_t('CodeBankAPI.LANGUAGE_NOT_SAME', '_Folder is not in the same language as the snippet');
                 return $response;
@@ -1022,7 +1047,7 @@ public function moveSnippet($data) {
             
             
             $response['status']="HELO";
-        }catch(Exception $e) {
+        } catch (Exception $e) {
             $response['status']="EROR";
             $response['message']="Internal Server error occured";
         }
@@ -1038,10 +1063,11 @@ public function moveSnippet($data) {
      * @param {string} $valueLbl Key's value mapping name
      * @return {array} Unmapped array
      */
-    final protected function arrayUnmap($array, $keyLbl='id', $valueLbl='title') {
+    final protected function arrayUnmap($array, $keyLbl='id', $valueLbl='title')
+    {
         $result=array();
         
-        foreach($array as $key=>$value) {
+        foreach ($array as $key=>$value) {
             $result[]=array(
                             $keyLbl=>$key,
                             $valueLbl=>$value
@@ -1061,7 +1087,8 @@ final protected function arrayUnmap($array, $keyLbl='id', $valueLbl='title') {
      * @param {string} ... Overloaded for additional fields, allows for silverstripe relation formatting ex: Relationship.Field the dot is replaced with a dash in the resulting object
      * @return {array} Nested array of items, each item has an id and a title key
      */
-    final protected function overviewList(SS_List $list, $labelField='Title', $idField='ID') {
+    final protected function overviewList(SS_List $list, $labelField='Title', $idField='ID')
+    {
         $result=array();
         $idFieldLower=strtolower($idField);
         $labelFieldLower=strtolower($labelField);
@@ -1073,34 +1100,34 @@ final protected function overviewList(SS_List $list, $labelField='Title', $idFie
         unset($args[2]);
         
         
-        foreach($list as $item) {
+        foreach ($list as $item) {
             $obj=new stdClass();
             $obj->$idFieldLower=$item->$idField;
             $obj->$labelFieldLower=$item->$labelField;
             
-            if(count($args)>0) {
-                foreach($args as $field) {
+            if (count($args)>0) {
+                foreach ($args as $field) {
                     $fieldLower=strtolower($field);
                     
                     //If the field contains a dot assume relationship and loop through till field is found
-                    if(strpos($field, '.')!==false) {
+                    if (strpos($field, '.')!==false) {
                         $fieldLower=str_replace('.', '-', $fieldLower);
                         $fieldBits=explode('.', $field);
                         
                         $value=$item;
-                        for($i=0;$i<count($fieldBits);$i++) {
+                        for ($i=0;$i<count($fieldBits);$i++) {
                             $fieldBit=$fieldBits[$i];
-                            if($i==count($fieldBits)-1) {
+                            if ($i==count($fieldBits)-1) {
                                 $value=$value->$fieldBit;
-                            }else {
+                            } else {
                                 $value=$value->$fieldBit();
                             }
                         }
                         
-                        if(!is_object($value)) {
+                        if (!is_object($value)) {
                             $obj->$fieldLower=$value;
                         }
-                    }else {
+                    } else {
                         $obj->$fieldLower=$item->$field;
                     }
                 }
@@ -1120,9 +1147,10 @@ final protected function overviewList(SS_List $list, $labelField='Title', $idFie
      * @param {array} $array Array to sort
      * @return {array} Finalized array
      */
-    final protected function sortToTop($value, $field, $array) {
-        foreach($array as $key=>$item) {
-            if($item->$field==$value) {
+    final protected function sortToTop($value, $field, $array)
+    {
+        foreach ($array as $key=>$item) {
+            if ($item->$field==$value) {
                 unset($array[$key]);
                 array_unshift($array, $item);
                 break;
@@ -1136,10 +1164,10 @@ final protected function sortToTop($value, $field, $array) {
      * Gets the permissions required to access the class
      * @return {array} Array of permission names to check
      */
-    public function getRequiredPermissions() {
+    public function getRequiredPermissions()
+    {
         return array(
                     'CODE_BANK_ACCESS'
                 );
     }
 }
-?>
\ No newline at end of file
diff --git a/code/classes/CodeBankAMFServer.php b/code/classes/CodeBankAMFServer.php
index 5b89009..75b2fec 100644
--- a/code/classes/CodeBankAMFServer.php
+++ b/code/classes/CodeBankAMFServer.php
@@ -1,5 +1,6 @@
 <?php
-class CodeBankAMFServer extends Zend_Amf_Server {
+class CodeBankAMFServer extends Zend_Amf_Server
+{
     /**
      * Loads a remote class or method and executes the function and returns the result
      * @param {string} $method Is the method to execute
@@ -7,20 +8,21 @@ class CodeBankAMFServer extends Zend_Amf_Server {
      * @return {mixed} $response the result of executing the method
      * @throws Zend_Amf_Server_Exception
      */
-    protected function _dispatch($method, $params=null, $source=null) {
-        if($source) {
-            if(($mapped=Zend_Amf_Parse_TypeLoader::getMappedClassName($source))!==false) {
+    protected function _dispatch($method, $params=null, $source=null)
+    {
+        if ($source) {
+            if (($mapped=Zend_Amf_Parse_TypeLoader::getMappedClassName($source))!==false) {
                 $source=$mapped;
             }
         }
         
         $qualifiedName=(empty($source) ? $method:$source.'.'.$method);
         
-        if(!isset($this->_table[$qualifiedName])) {
+        if (!isset($this->_table[$qualifiedName])) {
             // if source is null a method that was not defined was called.
-            if($source) {
+            if ($source) {
                 $className='CodeBank'.str_replace('.', '_', $source);
-                if(class_exists($className, false) && !isset($this->_classAllowed[$className])) {
+                if (class_exists($className, false) && !isset($this->_classAllowed[$className])) {
                     require_once 'Zend/Amf/Server/Exception.php';
                     throw new Zend_Amf_Server_Exception('Can not call "'.$className.'" - use setClass()');
                 }
@@ -36,7 +38,7 @@ protected function _dispatch($method, $params=null, $source=null) {
                 $this->setClass($className, $source);
             }
             
-            if(!isset($this->_table[$qualifiedName])) {
+            if (!isset($this->_table[$qualifiedName])) {
                 // Source is null or doesn't contain specified method
                 require_once 'Zend/Amf/Server/Exception.php';
                 throw new Zend_Amf_Server_Exception('Method "'.$method.'" does not exist');
@@ -46,44 +48,44 @@ protected function _dispatch($method, $params=null, $source=null) {
         $info=$this->_table[$qualifiedName];
         $argv=$info->getInvokeArguments();
     
-        if(0<count($argv)) {
+        if (0<count($argv)) {
             $params=array_merge($params, $argv);
         }
     
-        if($info instanceof Zend_Server_Reflection_Function) {
+        if ($info instanceof Zend_Server_Reflection_Function) {
             $func=$info->getName();
             $this->_checkAcl(null, $func);
             $return=call_user_func_array($func, $params);
-        }else if($info instanceof Zend_Server_Reflection_Method) {
+        } elseif ($info instanceof Zend_Server_Reflection_Method) {
             // Get class
             $class=$info->getDeclaringClass()->getName();
             
             //Check permissions
-            if($this->_canAccess($class)==false) {
+            if ($this->_canAccess($class)==false) {
                 $response=CodeBank_ClientAPI::responseBase();
                 $response['status']='EROR';
                 $response['message']=_t('CodeBankAPI.PERMISSION_DENINED', '_Permission Denied');
                 return $response;
             }
             
-            if('static'==$info->isStatic()) {
+            if ('static'==$info->isStatic()) {
                 // for some reason, invokeArgs() does not work the same as
                 // invoke(), and expects the first argument to be an object.
                 // So, using a callback if the method is static.
                 $this->_checkAcl($class, $info->getName());
                 $return=call_user_func_array(array($class, $info->getName()), $params);
-            }else {
+            } else {
                 // Object methods
                 try {
                     $object=$info->getDeclaringClass()->newInstance();
-                }catch(Exception $e) {
+                } catch (Exception $e) {
                     throw new Zend_Amf_Server_Exception('Error instantiating class '.$class.' to invoke method '.$info->getName().': '.$e->getMessage(), 621, $e);
                 }
                 
                 $this->_checkAcl($object, $info->getName());
                 $return=$info->invokeArgs($object, $params);
             }
-        }else {
+        } else {
             throw new Zend_Amf_Server_Exception('Method missing implementation '.get_class($info));
         }
     
@@ -94,15 +96,16 @@ protected function _dispatch($method, $params=null, $source=null) {
      * (Re)Build the dispatch table. The dispatch table consists of a an array of method name => Zend_Server_Reflection_Function_Abstract pairs
      * @return void
      */
-    protected function _buildDispatchTable() {
+    protected function _buildDispatchTable()
+    {
         $table=array();
-        foreach($this->_methods as $key=>$dispatchable) {
-            if($dispatchable instanceof Zend_Server_Reflection_Function_Abstract) {
+        foreach ($this->_methods as $key=>$dispatchable) {
+            if ($dispatchable instanceof Zend_Server_Reflection_Function_Abstract) {
                 $ns=str_replace('CodeBank', '', $dispatchable->getNamespace());
                 $name=$dispatchable->getName();
                 $name=(empty($ns) ? $name:$ns.'.'.$name);
                 
-                if(isset($table[$name])) {
+                if (isset($table[$name])) {
                     throw new Zend_Amf_Server_Exception('Duplicate method registered: '.$name);
                 }
                 
@@ -110,13 +113,13 @@ protected function _buildDispatchTable() {
                 continue;
             }
             
-            if($dispatchable instanceof Zend_Server_Reflection_Class) {
-                foreach($dispatchable->getMethods() as $method) {
+            if ($dispatchable instanceof Zend_Server_Reflection_Class) {
+                foreach ($dispatchable->getMethods() as $method) {
                     $ns=str_replace('CodeBank', '', $method->getNamespace());
                     $name=$method->getName();
                     $name=(empty($ns) ? $name:$ns.'.'.$name);
                     
-                    if(isset($table[$name])) {
+                    if (isset($table[$name])) {
                         throw new Zend_Amf_Server_Exception('Duplicate method registered: '.$name);
                     }
                     
@@ -133,7 +136,8 @@ protected function _buildDispatchTable() {
      * Whether of not the server is using sessions
      * @return bool
      */
-    public function isSession() {
+    public function isSession()
+    {
         return ($this->_session || array_key_exists($this->_sessionName, $_COOKIE));
     }
     
@@ -141,15 +145,16 @@ public function isSession() {
      * Checks to see if the member can access the requested class
      * @param {string|CodeBank_APIClass} $object Name of the class to check or an instance of CodeBank_APIClass
      */
-    protected function _canAccess($object) {
-        if(!is_object($object)) {
+    protected function _canAccess($object)
+    {
+        if (!is_object($object)) {
             $object=singleton($object);
         }
         
         //Ensure the object is an instance of CodeBank_APIClass
-        if(!($object instanceof CodeBank_APIClass)) {
+        if (!($object instanceof CodeBank_APIClass)) {
             //If in dev mode and object is an instance of ZendAmfServiceBrowser return true
-            if(Director::isDev() && $object instanceof ZendAmfServiceBrowser) {
+            if (Director::isDev() && $object instanceof ZendAmfServiceBrowser) {
                 return true;
             }
             
@@ -161,16 +166,16 @@ protected function _canAccess($object) {
         $perms=$object->getRequiredPermissions();
         
         //Check to see if the permissions are not empty
-        if(!empty($perms) && $perms!==false) {
+        if (!empty($perms) && $perms!==false) {
             //Ensure we have an array, if not throw an exception
-            if(!is_array($perms)) {
+            if (!is_array($perms)) {
                 throw new Zend_Amf_Exception('CodeBank_APIClass::getRequiredPermissions() Should return an array of permissions to check');
                 return false;
             }
             
             //Loop through and ensure the user has the required permissions return false if they are missing any
-            foreach($perms as $permission) {
-                if(!Permission::check($permission)) {
+            foreach ($perms as $permission) {
+                if (!Permission::check($permission)) {
                     return false;
                 }
             }
@@ -179,4 +184,3 @@ protected function _canAccess($object) {
         return true;
     }
 }
-?>
\ No newline at end of file
diff --git a/code/classes/SnippetTreeCreatorFilter.php b/code/classes/SnippetTreeCreatorFilter.php
index fd6d1b4..d17b4ac 100644
--- a/code/classes/SnippetTreeCreatorFilter.php
+++ b/code/classes/SnippetTreeCreatorFilter.php
@@ -1,66 +1,69 @@
-<?php
-class SnippetTreeCreatorFilter extends SnippetTreeFilter {
-    /**
-     * @return Array Map of Snippet Language IDs
-     */
-    public function snippetLanguagesIncluded() {
-        $ids=array();
-        $q=new SQLQuery();
-        $q->setSelect(array('"Snippet"."ID"', '"Snippet"."LanguageID"'))->setFrom('"Snippet"');
-        
-        if(!empty($this->creator)) {
-            $q->setWhereAny(array(
-                                "\"CreatorID\"=".intval($this->creator)
-                            ));
-        }
-        
-        foreach($q->execute() as $row) {
-            $ids[]=array('ID'=>$row['LanguageID']);
-        }
-        
-        return $ids;
-    }
-    
-    /**
-     * @return Array Map of Snippet IDs
-     */
-    public function snippetsIncluded() {
-        $ids=array();
-        $q=new SQLQuery();
-        $q->setSelect(array('"Snippet"."ID"', '"Snippet"."LanguageID"'))->setFrom('"Snippet"');
-        
-        if(!empty($this->creator)) {
-            $q->setWhereAny(array(
-                            "\"CreatorID\"=".intval($this->creator)
-                        ));
-        }
-        
-        
-        foreach($q->execute() as $row) {
-            $ids[]=array('ID'=>$row['ID']);
-        }
-        
-        return $ids;
-    }
-    /**
-     * @return Array Map of Snippet Folder IDs
-     */
-    public function snippetFoldersIncluded() {
-        $ids=array();
-        $q=new SQLQuery();
-        $q->setSelect(array('"Snippet"."ID"', '"Snippet"."FolderID"'))->setFrom('"Snippet"');
-        
-        if(!empty($this->creator)) {
-            $q->setWhereAny(array(
-                                "\"CreatorID\"=".intval($this->creator)
-                            ));
-        }
-        
-        foreach($q->execute() as $row) {
-            $ids[]=array('ID'=>$row['FolderID']);
-        }
-        
-        return $ids;
-    }
-}
-?>
\ No newline at end of file
+<?php
+class SnippetTreeCreatorFilter extends SnippetTreeFilter
+{
+    /**
+     * @return Array Map of Snippet Language IDs
+     */
+    public function snippetLanguagesIncluded()
+    {
+        $ids=array();
+        $q=new SQLQuery();
+        $q->setSelect(array('"Snippet"."ID"', '"Snippet"."LanguageID"'))->setFrom('"Snippet"');
+        
+        if (!empty($this->creator)) {
+            $q->setWhereAny(array(
+                                "\"CreatorID\"=".intval($this->creator)
+                            ));
+        }
+        
+        foreach ($q->execute() as $row) {
+            $ids[]=array('ID'=>$row['LanguageID']);
+        }
+        
+        return $ids;
+    }
+    
+    /**
+     * @return Array Map of Snippet IDs
+     */
+    public function snippetsIncluded()
+    {
+        $ids=array();
+        $q=new SQLQuery();
+        $q->setSelect(array('"Snippet"."ID"', '"Snippet"."LanguageID"'))->setFrom('"Snippet"');
+        
+        if (!empty($this->creator)) {
+            $q->setWhereAny(array(
+                            "\"CreatorID\"=".intval($this->creator)
+                        ));
+        }
+        
+        
+        foreach ($q->execute() as $row) {
+            $ids[]=array('ID'=>$row['ID']);
+        }
+        
+        return $ids;
+    }
+    /**
+     * @return Array Map of Snippet Folder IDs
+     */
+    public function snippetFoldersIncluded()
+    {
+        $ids=array();
+        $q=new SQLQuery();
+        $q->setSelect(array('"Snippet"."ID"', '"Snippet"."FolderID"'))->setFrom('"Snippet"');
+        
+        if (!empty($this->creator)) {
+            $q->setWhereAny(array(
+                                "\"CreatorID\"=".intval($this->creator)
+                            ));
+        }
+        
+        foreach ($q->execute() as $row) {
+            $ids[]=array('ID'=>$row['FolderID']);
+        }
+        
+        return $ids;
+    }
+}
diff --git a/code/classes/SnippetTreeFilter.php b/code/classes/SnippetTreeFilter.php
index 370beaf..22e1b24 100644
--- a/code/classes/SnippetTreeFilter.php
+++ b/code/classes/SnippetTreeFilter.php
@@ -1,5 +1,6 @@
 <?php
-class SnippetTreeFilter extends Object {
+class SnippetTreeFilter extends Object
+{
     /**
      * @var Array Search parameters, mostly properties on {@link SiteTree}.
      * Caution: Unescaped data.
@@ -26,8 +27,9 @@ class SnippetTreeFilter extends Object {
      */
     protected $childrenMethod=null;
     
-    public function __construct($params=null) {
-        if($params) {
+    public function __construct($params=null)
+    {
+        if ($params) {
             $this->params=$params;
         }
     
@@ -37,19 +39,21 @@ public function __construct($params=null) {
     /**
      * @return {string} Method on {@link Hierarchy} objects which is used to traverse into children relationships.
      */
-    public function getChildrenMethod() {
+    public function getChildrenMethod()
+    {
         return $this->childrenMethod;
     }
     
     /**
      * @return Array Map of Snippet Language IDs
      */
-    public function snippetLanguagesIncluded() {
-        if($this->_cache_snippet_ids===null) {
+    public function snippetLanguagesIncluded()
+    {
+        if ($this->_cache_snippet_ids===null) {
             $this->populateSnippetIDs();
         }
         
-        if(empty($this->_cache_snippet_ids)) {
+        if (empty($this->_cache_snippet_ids)) {
             return array();
         }
         
@@ -57,7 +61,7 @@ public function snippetLanguagesIncluded() {
         $q=SnippetLanguage::get()
                                 ->innerJoin('Snippet', '"Snippet"."LanguageID"="SnippetLanguage"."ID"');
         
-        if(isset($this->params['LanguageID']) && !empty($this->params['LanguageID'])) {
+        if (isset($this->params['LanguageID']) && !empty($this->params['LanguageID'])) {
             $q=$q->filter('ID', intval($this->params['LanguageID']));
         }
         
@@ -70,11 +74,12 @@ public function snippetLanguagesIncluded() {
     /**
      * @return Array Map of Snippet IDs
      */
-    public function snippetsIncluded() {
+    public function snippetsIncluded()
+    {
         $searchEngine=Config::inst()->get('CodeBank', 'snippet_search_engine');
-        if($searchEngine && class_exists($searchEngine) && in_array('ICodeBankSearchEngine', class_implements($searchEngine))) {
+        if ($searchEngine && class_exists($searchEngine) && in_array('ICodeBankSearchEngine', class_implements($searchEngine))) {
             $searchEngine=new $searchEngine();
-        }else {
+        } else {
             //Class is missing or invalid so fallback to the default
             $searchEngine=new DefaultCodeBankSearchEngine();
         }
@@ -86,12 +91,13 @@ public function snippetsIncluded() {
     /**
      * @return Array Map of Snippet Folder IDs
      */
-    public function snippetFoldersIncluded() {
-        if($this->_cache_snippet_ids===null) {
+    public function snippetFoldersIncluded()
+    {
+        if ($this->_cache_snippet_ids===null) {
             $this->populateSnippetIDs();
         }
         
-        if(empty($this->_cache_snippet_ids)) {
+        if (empty($this->_cache_snippet_ids)) {
             return array();
         }
         
@@ -99,7 +105,7 @@ public function snippetFoldersIncluded() {
         
         $q=SnippetFolder::get();
         
-        if(isset($this->params['LanguageID']) && !empty($this->params['LanguageID'])) {
+        if (isset($this->params['LanguageID']) && !empty($this->params['LanguageID'])) {
             $q=$q->filter('LanguageID', intval($this->params['LanguageID']));
         }
         
@@ -111,12 +117,13 @@ public function snippetFoldersIncluded() {
     /**
      * Populate the IDs of the snippet languages returned by snippetLanguagesIncluded()
      */
-    protected function populateLanguageIDs() {
+    protected function populateLanguageIDs()
+    {
         $this->_cache_language_ids=array();
-        if($snippetLanguages=$this->snippetLanguagesIncluded()) {
+        if ($snippetLanguages=$this->snippetLanguagesIncluded()) {
             // And keep a record of parents we don't need to get
             // parents of themselves, as well as IDs to mark
-            foreach($snippetLanguages as $langId) {
+            foreach ($snippetLanguages as $langId) {
                 $this->_cache_language_ids[$langId]=true;
             }
         }
@@ -125,12 +132,13 @@ protected function populateLanguageIDs() {
     /**
      * Populate the IDs of the snippets returned by snippetsIncluded()
      */
-    protected function populateSnippetIDs() {
+    protected function populateSnippetIDs()
+    {
         $this->_cache_snippet_ids=array();
-        if($snippets=$this->snippetsIncluded()) {
+        if ($snippets=$this->snippetsIncluded()) {
             // And keep a record of parents we don't need to get
             // parents of themselves, as well as IDs to mark
-            foreach($snippets as $snippetId) {
+            foreach ($snippets as $snippetId) {
                 $this->_cache_snippet_ids[$snippetId]=true;
             }
         }
@@ -139,12 +147,13 @@ protected function populateSnippetIDs() {
     /**
      * Populate the IDs of the snippet languages returned by snippetLanguagesIncluded()
      */
-    protected function populateFolderIDs() {
+    protected function populateFolderIDs()
+    {
         $this->_cache_language_ids=array();
-        if($snippetFolders=$this->snippetFoldersIncluded()) {
+        if ($snippetFolders=$this->snippetFoldersIncluded()) {
             // And keep a record of parents we don't need to get
             // parents of themselves, as well as IDs to mark
-            foreach($snippetFolders as $folderId) {
+            foreach ($snippetFolders as $folderId) {
                 $this->_cache_folder_ids[$folderId]=true;
             }
         }
@@ -155,21 +164,22 @@ protected function populateFolderIDs() {
      * @param {SnippetLanguage|Snippet|SnippetFolder} $obj Object to be checked
      * @return {bool} Returns boolean true if the snippet or language or folder should be included in the tree false otherwise
      */
-    public function isSnippetLanguageIncluded($obj) {
-        if($obj instanceof SnippetLanguage) {
-            if($this->_cache_language_ids===null) {
+    public function isSnippetLanguageIncluded($obj)
+    {
+        if ($obj instanceof SnippetLanguage) {
+            if ($this->_cache_language_ids===null) {
                 $this->populateLanguageIDs();
             }
             
             return (isset($this->_cache_language_ids[$obj->ID]) && $this->_cache_language_ids[$obj->ID]);
-        }else if($obj instanceof Snippet) {
-            if($this->_cache_snippet_ids===null) {
+        } elseif ($obj instanceof Snippet) {
+            if ($this->_cache_snippet_ids===null) {
                 $this->populateSnippetIDs();
             }
             
             return (isset($this->_cache_snippet_ids[$obj->ID]) && $this->_cache_snippet_ids[$obj->ID]);
-        }else if($obj instanceof SnippetFolder) {
-            if($this->_cache_folder_ids===null) {
+        } elseif ($obj instanceof SnippetFolder) {
+            if ($this->_cache_folder_ids===null) {
                 $this->populateFolderIDs();
             }
             
@@ -179,4 +189,3 @@ public function isSnippetLanguageIncluded($obj) {
         return false;
     }
 }
-?>
\ No newline at end of file
diff --git a/code/classes/SnippetTreeTagFilter.php b/code/classes/SnippetTreeTagFilter.php
index 096b968..b775f69 100644
--- a/code/classes/SnippetTreeTagFilter.php
+++ b/code/classes/SnippetTreeTagFilter.php
@@ -1,78 +1,82 @@
-<?php
-class SnippetTreeTagFilter extends SnippetTreeFilter {
-    public function __construct($tag=null) {
-        if($tag) {
-            $this->tag=$tag;
-        }
-    
-        parent::__construct();
-    }
-    
-    /**
-     * @return Array Map of Snippet Language IDs
-     */
-    public function snippetLanguagesIncluded() {
-        $ids=array();
-        $q=new SQLQuery();
-        $q->setSelect(array('"Snippet"."ID"', '"Snippet"."LanguageID"'))->setFrom('"Snippet"');
-        
-        if(!empty($this->tag)) {
-            $SQL_val=Convert::raw2sql($this->tag);
-            $q->setWhereAny(array(
-                                "\"Tags\" LIKE '$SQL_val,%' OR \"Tags\" LIKE '%,$SQL_val' OR \"Tags\" LIKE '%,$SQL_val,%' OR \"Tags\" LIKE '$SQL_val'"
-                            ));
-        }
-        
-        foreach($q->execute() as $row) {
-            $ids[]=array('ID'=>$row['LanguageID']);
-        }
-        
-        return $ids;
-    }
-    
-    /**
-     * @return Array Map of Snippet IDs
-     */
-    public function snippetsIncluded() {
-        $ids=array();
-        $q=new SQLQuery();
-        $q->setSelect(array('"Snippet"."ID"', '"Snippet"."LanguageID"'))->setFrom('"Snippet"');
-        
-        if(!empty($this->tag)) {
-            $SQL_val=Convert::raw2sql($this->tag);
-            $q->setWhereAny(array(
-                            "\"Tags\" LIKE '$SQL_val,%' OR \"Tags\" LIKE '%,$SQL_val' OR \"Tags\" LIKE '%,$SQL_val,%' OR \"Tags\" LIKE '$SQL_val'"
-                        ));
-        }
-        
-        
-        foreach($q->execute() as $row) {
-            $ids[]=array('ID'=>$row['ID']);
-        }
-        
-        return $ids;
-    }
-    
-    /**
-     * @return Array Map of Snippet Folder IDs
-     */
-    public function snippetFoldersIncluded() {
-        $ids=array();
-        $q=new SQLQuery();
-        $q->setSelect(array('"Snippet"."ID"', '"Snippet"."FolderID"'))->setFrom('"Snippet"');
-        
-        if(!empty($this->tag)) {
-            $SQL_val=Convert::raw2sql($this->tag);
-            $q->setWhereAny(array(
-                                "\"Tags\" LIKE '$SQL_val,%' OR \"Tags\" LIKE '%,$SQL_val' OR \"Tags\" LIKE '%,$SQL_val,%' OR \"Tags\" LIKE '$SQL_val'"
-                            ));
-        }
-        
-        foreach($q->execute() as $row) {
-            $ids[]=array('ID'=>$row['FolderID']);
-        }
-        
-        return $ids;
-    }
-}
-?>
\ No newline at end of file
+<?php
+class SnippetTreeTagFilter extends SnippetTreeFilter
+{
+    public function __construct($tag=null)
+    {
+        if ($tag) {
+            $this->tag=$tag;
+        }
+    
+        parent::__construct();
+    }
+    
+    /**
+     * @return Array Map of Snippet Language IDs
+     */
+    public function snippetLanguagesIncluded()
+    {
+        $ids=array();
+        $q=new SQLQuery();
+        $q->setSelect(array('"Snippet"."ID"', '"Snippet"."LanguageID"'))->setFrom('"Snippet"');
+        
+        if (!empty($this->tag)) {
+            $SQL_val=Convert::raw2sql($this->tag);
+            $q->setWhereAny(array(
+                                "\"Tags\" LIKE '$SQL_val,%' OR \"Tags\" LIKE '%,$SQL_val' OR \"Tags\" LIKE '%,$SQL_val,%' OR \"Tags\" LIKE '$SQL_val'"
+                            ));
+        }
+        
+        foreach ($q->execute() as $row) {
+            $ids[]=array('ID'=>$row['LanguageID']);
+        }
+        
+        return $ids;
+    }
+    
+    /**
+     * @return Array Map of Snippet IDs
+     */
+    public function snippetsIncluded()
+    {
+        $ids=array();
+        $q=new SQLQuery();
+        $q->setSelect(array('"Snippet"."ID"', '"Snippet"."LanguageID"'))->setFrom('"Snippet"');
+        
+        if (!empty($this->tag)) {
+            $SQL_val=Convert::raw2sql($this->tag);
+            $q->setWhereAny(array(
+                            "\"Tags\" LIKE '$SQL_val,%' OR \"Tags\" LIKE '%,$SQL_val' OR \"Tags\" LIKE '%,$SQL_val,%' OR \"Tags\" LIKE '$SQL_val'"
+                        ));
+        }
+        
+        
+        foreach ($q->execute() as $row) {
+            $ids[]=array('ID'=>$row['ID']);
+        }
+        
+        return $ids;
+    }
+    
+    /**
+     * @return Array Map of Snippet Folder IDs
+     */
+    public function snippetFoldersIncluded()
+    {
+        $ids=array();
+        $q=new SQLQuery();
+        $q->setSelect(array('"Snippet"."ID"', '"Snippet"."FolderID"'))->setFrom('"Snippet"');
+        
+        if (!empty($this->tag)) {
+            $SQL_val=Convert::raw2sql($this->tag);
+            $q->setWhereAny(array(
+                                "\"Tags\" LIKE '$SQL_val,%' OR \"Tags\" LIKE '%,$SQL_val' OR \"Tags\" LIKE '%,$SQL_val,%' OR \"Tags\" LIKE '$SQL_val'"
+                            ));
+        }
+        
+        foreach ($q->execute() as $row) {
+            $ids[]=array('ID'=>$row['FolderID']);
+        }
+        
+        return $ids;
+    }
+}
diff --git a/code/control/CodeBank.php b/code/control/CodeBank.php
index a3c38b7..b9455a8 100644
--- a/code/control/CodeBank.php
+++ b/code/control/CodeBank.php
@@ -1,5 +1,6 @@
 <?php
-class CodeBank extends LeftAndMain implements PermissionProvider {
+class CodeBank extends LeftAndMain implements PermissionProvider
+{
     private static $url_segment='codeBank';
     private static $tree_class='SnippetLanguage';
     private static $url_rule='/$Action/$ID/$OtherID';
@@ -44,7 +45,8 @@ class CodeBank extends LeftAndMain implements PermissionProvider {
      * Constructor
      * @see LeftAndMain::__construct()
      */
-    public function __construct() {
+    public function __construct()
+    {
         parent::__construct();
         
         //Work around to allow dynamic path
@@ -54,7 +56,8 @@ public function __construct() {
     /**
      * Initializes the code bank admin
      */
-    public function init() {
+    public function init()
+    {
         parent::init();
         
         Requirements::css(CB_DIR.'/css/CodeBank.css');
@@ -63,15 +66,18 @@ public function init() {
         Requirements::customScript("var CB_DIR='".CB_DIR."';", 'cb_dir');
         Requirements::javascript(CB_DIR.'/javascript/CodeBank.Tree.js');
         
-        if(!empty(CodeBankConfig::CurrentConfig()->IPMessage) && Session::get('CodeBankIPAgreed')!==true) {
+        if (!empty(CodeBankConfig::CurrentConfig()->IPMessage) && Session::get('CodeBankIPAgreed')!==true) {
             $this->redirect('admin/codeBank/agreement');
         }
     }
     
-    public function index($request) {
+    public function index($request)
+    {
         // In case we're not showing a specific record, explicitly remove any session state,
         // to avoid it being highlighted in the tree, and causing an edit form to show.
-        if(!$request->param('Action')) $this->setCurrentPageId(null);
+        if (!$request->param('Action')) {
+            $this->setCurrentPageId(null);
+        }
 
         return parent::index($request);
     }
@@ -81,7 +87,8 @@ public function index($request) {
      * @param {string} $action Action to be used
      * @return {string} Resulting link
      */
-    public function Link($action=null) {
+    public function Link($action=null)
+    {
         $link = Controller::join_links(
             $this->stat('url_base', true),
             $this->stat('url_segment', true), // in case we want to change the segment
@@ -98,7 +105,8 @@ public function Link($action=null) {
      * @param {string} Link to
      * @return {string} Link with search params
      */
-    protected function LinkWithSearch($link) {
+    protected function LinkWithSearch($link)
+    {
         // Whitelist to avoid side effects
         $params=array(
                     'q'=>(array)$this->request->getVar('q'),
@@ -120,12 +128,13 @@ protected function LinkWithSearch($link) {
      * Gets the main tab link
      * @return {string} URL to the main tab
      */
-    public function getLinkMain() {
-        if($this->currentPageID()!=0 && $this->class=='CodeBankEditSnippet') {
+    public function getLinkMain()
+    {
+        if ($this->currentPageID()!=0 && $this->class=='CodeBankEditSnippet') {
             return $this->LinkWithSearch(Controller::join_links($this->Link('show'), $this->currentPageID()));
-        }else if($this->currentPageID()!=0 && $this->class=='CodeBank') {
+        } elseif ($this->currentPageID()!=0 && $this->class=='CodeBank') {
             $otherID=null;
-            if(!empty($this->urlParams['OtherID']) && is_numeric($this->urlParams['OtherID'])) {
+            if (!empty($this->urlParams['OtherID']) && is_numeric($this->urlParams['OtherID'])) {
                 $otherID=intval($this->urlParams['OtherID']);
             }
             
@@ -141,8 +150,9 @@ public function getLinkMain() {
      * @param {FieldList} $fields Fields to use
      * @return {Form} Form to be used
      */
-    public function getEditForm($id=null, $fields=null) {
-        if(!$id) {
+    public function getEditForm($id=null, $fields=null)
+    {
+        if (!$id) {
             $id=$this->currentPageID();
         }
         
@@ -151,12 +161,12 @@ public function getEditForm($id=null, $fields=null) {
         
         
         $record=$this->getRecord($id);
-        if($record && !$record->canView()) {
+        if ($record && !$record->canView()) {
             return Security::permissionFailure($this);
         }
         
         
-        if(!$fields) {
+        if (!$fields) {
             $fields=$form->Fields();
         }
         
@@ -164,7 +174,7 @@ public function getEditForm($id=null, $fields=null) {
         $actions=$form->Actions();
         
         
-        if($record) {
+        if ($record) {
             $fields->push($idField=new HiddenField("ID", false, $id));
             $versions=$record->Versions()->filter('ID:not', $record->CurrentVersionID)->Map('ID', 'Created');
             $actions=new FieldList(
@@ -183,25 +193,25 @@ public function getEditForm($id=null, $fields=null) {
             
             // Use <button> to allow full jQuery UI styling
             $actionsFlattened=$actions->dataFields();
-            if($actionsFlattened) {
-                foreach($actionsFlattened as $action) {
-                    if($action instanceof FormAction) {
+            if ($actionsFlattened) {
+                foreach ($actionsFlattened as $action) {
+                    if ($action instanceof FormAction) {
                         $action->setUseButtonTag(true);
                     }
                 }
             }
             
             
-            if($record->hasMethod('getCMSValidator')) {
+            if ($record->hasMethod('getCMSValidator')) {
                 $validator=$record->getCMSValidator();
-            }else {
+            } else {
                 $validator=new RequiredFields();
             }
             
             
-            if($record->Package() && $record->Package()!==false && $record->Package()->ID!=0) {
+            if ($record->Package() && $record->Package()!==false && $record->Package()->ID!=0) {
                 $package=new ArrayList(array($record->Package()));
-            }else {
+            } else {
                 $package=null;
             }
             
@@ -228,9 +238,9 @@ public function getEditForm($id=null, $fields=null) {
             
             
             //Swap content for version text
-            if(!empty($this->urlParams['OtherID']) && is_numeric($this->urlParams['OtherID'])) {
+            if (!empty($this->urlParams['OtherID']) && is_numeric($this->urlParams['OtherID'])) {
                 $version=$record->Version(intval($this->urlParams['OtherID']));
-                if(!empty($version) && $version!==false && $version->ID!=0) {
+                if (!empty($version) && $version!==false && $version->ID!=0) {
                     $fields->dataFieldByName('SnippetText')->setValue($version->Text);
                     $fields->dataFieldByName('LastModified')->setValue($version->LastEdited);
                     $fields->dataFieldByName('CurrentVersionID')->setValue($version->ID);
@@ -257,14 +267,14 @@ public function getEditForm($id=null, $fields=null) {
             
             
             //Display message telling user to run dev/build because the version numbers are out of sync
-            if(CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
+            if (CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
                 $form->Fields()->insertBefore(new LiteralField('DBUpgrade', '<p class="message error">'._t('CodeBank.UPDATE_NEEDED', '_A database upgrade is required please run {startlink}dev/build{endlink}.', array('startlink'=>'<a href="dev/build?flush=all">', 'endlink'=>'</a>')).'</p>'), 'Title');
-            }else if($this->hasOldTables()) {
+            } elseif ($this->hasOldTables()) {
                 $form->Fields()->insertBefore(new LiteralField('DBUpgrade', '<p class="message warning">'._t('CodeBank.MIGRATION_AVAILABLE', '_It appears you are upgrading from Code Bank 2.2.x, your old data can be migrated {startlink}click here to begin{endlink}, though it is recommended you backup your database first.', array('startlink'=>'<a href="dev/tasks/CodeBankLegacyMigrate">', 'endlink'=>'</a>')).'</p>'), 'Title');
             }
             
             return $form;
-        }else if($id) {
+        } elseif ($id) {
             $form=CMSForm::create($this, 'EditForm', new FieldList(
                                                             new TabSet('Root',
                                                                             new Tab('Main', ' ',
@@ -279,22 +289,22 @@ public function getEditForm($id=null, $fields=null) {
             
             
             //Display message telling user to run dev/build because the version numbers are out of sync
-            if(CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
+            if (CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
                 $form->Fields()->insertBefore(new LiteralField('DBUpgrade', '<p class="message error">'._t('CodeBank.UPDATE_NEEDED', '_A database upgrade is required please run {startlink}dev/build{endlink}.', array('startlink'=>'<a href="dev/build?flush=all">', 'endlink'=>'</a>')).'</p>'), 'DoesntExist');
-            }else if($this->hasOldTables()) {
+            } elseif ($this->hasOldTables()) {
                 $form->Fields()->insertBefore(new LiteralField('DBUpgrade', '<p class="message warning">'._t('CodeBank.MIGRATION_AVAILABLE', '_It appears you are upgrading from Code Bank 2.2.x, your old data can be migrated {startlink}click here to begin{endlink}, though it is recommended you backup your database first.', array('startlink'=>'<a href="dev/tasks/CodeBankLegacyMigrate">', 'endlink'=>'</a>')).'</p>'), 'DoesntExistLabel');
             }
-        }else {
+        } else {
             $form=$this->EmptyForm();
-            if(Session::get('CodeBank.deletedSnippetID')) {
+            if (Session::get('CodeBank.deletedSnippetID')) {
                 $form->Fields()->push(new HiddenField('ID', 'ID', Session::get('CodeBank.deletedSnippetID')));
             }
             
             
             //Display message telling user to run dev/build because the version numbers are out of sync
-            if(CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
+            if (CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
                 $form->Fields()->push(new LiteralField('DBUpgrade', '<p class="message error">'._t('CodeBank.UPDATE_NEEDED', '_A database upgrade is required please run {startlink}dev/build{endlink}.', array('startlink'=>'<a href="dev/build?flush=all">', 'endlink'=>'</a>')).'</p>'));
-            }else if($this->hasOldTables()) {
+            } elseif ($this->hasOldTables()) {
                 $form->Fields()->push(new LiteralField('DBUpgrade', '<p class="message warning">'._t('CodeBank.MIGRATION_AVAILABLE', '_It appears you are upgrading from Code Bank 2.2.x, your old data can be migrated {startlink}click here to begin{endlink}, though it is recommended you backup your database first.', array('startlink'=>'<a href="dev/tasks/CodeBankLegacyMigrate">', 'endlink'=>'</a>')).'</p>'));
             }
         }
@@ -314,7 +324,8 @@ public function getEditForm($id=null, $fields=null) {
      * Gets the link to the tree view
      * @return {string} Link to the tree load
      */
-    public function getLinkTreeView() {
+    public function getLinkTreeView()
+    {
         return $this->LinkWithSearch($this->Link('tree'));
     }
     
@@ -322,7 +333,8 @@ public function getLinkTreeView() {
      * Gets the snippet tree view
      * @return {string} Rendered snippet tree
      */
-    public function tree() {
+    public function tree()
+    {
         return $this->renderWith('CodeBank_TreeView');
     }
     
@@ -330,18 +342,19 @@ public function tree() {
      * Get a subtree underneath the request param 'ID'.
      * If ID = 0, then get the whole tree.
      */
-    public function getsubtree($request) {
-        if(strpos($request->getVar('ID'), 'folder-')!==false) {
+    public function getsubtree($request)
+    {
+        if (strpos($request->getVar('ID'), 'folder-')!==false) {
             $folderID=(strpos($request->getVar('ID'), 'folder-')!==false ? intval(str_replace('folder-', '', $request->getVar('ID'))):null);
             $html=$this->getSiteTreeFor('SnippetFolder', $folderID, 'Children', null, array($this, 'hasSnippets'));
-        }else {
+        } else {
             $languageID=(strpos($request->getVar('ID'), 'language-')!==false ? intval(str_replace('language-', '', $request->getVar('ID'))):null);
             $html=$this->getSiteTreeFor($this->stat('tree_class'), $languageID, 'Children', null, array($this, 'hasSnippets'));
         }
 
         // Trim off the outer tag
-        $html=preg_replace('/^[\s\t\r\n]*<ul[^>]*>/','', $html);
-        $html=preg_replace('/<\/ul[^>]*>[\s\t\r\n]*$/','', $html);
+        $html=preg_replace('/^[\s\t\r\n]*<ul[^>]*>/', '', $html);
+        $html=preg_replace('/<\/ul[^>]*>[\s\t\r\n]*$/', '', $html);
         
         return $html;
     }
@@ -354,11 +367,12 @@ public function getsubtree($request) {
      *
      * @return String JSON
      */
-    public function updatetreenodes($request) {
+    public function updatetreenodes($request)
+    {
         $data=array();
         $ids=explode(',', $request->getVar('ids'));
-        foreach($ids as $id) {
-            if($id==Session::get('CodeBank.deletedSnippetID')) {
+        foreach ($ids as $id) {
+            if ($id==Session::get('CodeBank.deletedSnippetID')) {
                 Session::clear('CodeBank.deletedSnippetID');
                 $this->response->addHeader('Content-Type', 'text/json');
                 return '{"'.$id.'": false}';
@@ -370,7 +384,7 @@ public function updatetreenodes($request) {
             $next=$prev=null;
             $className=$this->stat('tree_class');
             $next=Snippet::get()->filter('LanguageID', $record->LanguageID)->filter('FolderID', $record->FolderID)->filter('Title:GreaterThan', $record->Title)->first();
-            if(!$next) {
+            if (!$next) {
                 $prev=Snippet::get()->filter('LanguageID', $record->LanguageID)->filter('FolderID', $record->FolderID)->filter('Title:LessThan', $record->Title)->reverse()->first();
             }
             
@@ -394,7 +408,8 @@ public function updatetreenodes($request) {
      * Checks to see if the tree should be filtered or not
      * @return {bool}
      */
-    public function TreeIsFiltered() {
+    public function TreeIsFiltered()
+    {
         return ($this->request->getVar('q') || $this->request->getVar('tag') || $this->request->getVar('creator'));
     }
     
@@ -402,7 +417,8 @@ public function TreeIsFiltered() {
      * Gets the snippet language tree as an unordered list
      * @return {string} XHTML forming the tree of languages to snippets
      */
-    public function SiteTreeAsUL() {
+    public function SiteTreeAsUL()
+    {
         $html=$this->getSiteTreeFor($this->stat('tree_class'), null, 'Children', null);
         
         $this->extend('updateSiteTreeAsUL', $html);
@@ -417,39 +433,40 @@ public function SiteTreeAsUL() {
      * @param $childrenMethod The method to call to get the children of the tree. For example, Children, AllChildrenIncludingDeleted, or AllHistoricalChildren
      * @return String Nested unordered list with links to each page
      */
-    public function getSiteTreeFor($className, $rootID=null, $childrenMethod=null, $numChildrenMethod=null, $filterFunction=null, $minNodeCount=30) {
+    public function getSiteTreeFor($className, $rootID=null, $childrenMethod=null, $numChildrenMethod=null, $filterFunction=null, $minNodeCount=30)
+    {
         // Filter criteria
         $params=$this->request->getVar('q');
         $tag=$this->request->getVar('tag');
         $creator=$this->request->getVar('creator');
-        if($params) {
+        if ($params) {
             $filterClass=CodeBank::$filter_class;
-            if($filterClass!='SnippetTreeFilter' && !is_subclass_of($filterClass, 'SnippetTreeFilter')) {
+            if ($filterClass!='SnippetTreeFilter' && !is_subclass_of($filterClass, 'SnippetTreeFilter')) {
                 throw new Exception(sprintf('Invalid filter class passed: %s', $filterClass));
             }
             
             $filter=new $filterClass($params);
-        }else if($tag && !empty($tag)) {
+        } elseif ($tag && !empty($tag)) {
             $filter=new SnippetTreeTagFilter($tag);
-        }else if($creator && intval($creator)>0) {
+        } elseif ($creator && intval($creator)>0) {
             $filter=new SnippetTreeCreatorFilter($creator);
-        }else {
+        } else {
             $filter=null;
         }
         
         
         // Default childrenMethod and numChildrenMethod
-        if(!$childrenMethod) {
+        if (!$childrenMethod) {
             $childrenMethod=($filter && $filter->getChildrenMethod() ? $filter->getChildrenMethod():'AllChildrenIncludingDeleted');
         }
         
         
-        if(!$numChildrenMethod) {
+        if (!$numChildrenMethod) {
             $numChildrenMethod='numChildren';
         }
         
         
-        if(!$filterFunction) {
+        if (!$filterFunction) {
             $filterFunction=($filter ? array($filter, 'isSnippetLanguageIncluded'):array($this, 'hasSnippets'));
         }
         
@@ -459,21 +476,21 @@ public function getSiteTreeFor($className, $rootID=null, $childrenMethod=null, $
         $obj=($record ? $record:singleton($className));
         
         // Mark the nodes of the tree to return
-        if($filterFunction) {
+        if ($filterFunction) {
             $obj->setMarkingFilterFunction($filterFunction);
         }
         
         $obj->markPartialTree($minNodeCount, $this, $childrenMethod, $numChildrenMethod);
         
         // Ensure current page is exposed
-        if($p=$this->currentPage()) {
+        if ($p=$this->currentPage()) {
             $obj->markToExpose($p);
         }
         
         // getChildrenAsUL is a flexible and complex way of traversing the tree
         $controller=$this;
         $recordController=singleton('CodeBank');
-        $titleFn=function(&$child) use(&$controller, &$recordController) {
+        $titleFn=function (&$child) use (&$controller, &$recordController) {
             $link=Controller::join_links($recordController->Link("show"), $child->ID);
             return CodeBank_TreeNode::create($child, $link, $controller->isCurrentPage($child))->forTemplate();
         };
@@ -483,16 +500,16 @@ public function getSiteTreeFor($className, $rootID=null, $childrenMethod=null, $
         
         
         // Wrap the root if needs be.
-        if(!$rootID) {
+        if (!$rootID) {
             $rootLink=$this->Link('show') . '/root';
             
             // This lets us override the tree title with an extension
-            if($this->hasMethod('getCMSTreeTitle') && $customTreeTitle=$this->getCMSTreeTitle()) {
+            if ($this->hasMethod('getCMSTreeTitle') && $customTreeTitle=$this->getCMSTreeTitle()) {
                 $treeTitle=$customTreeTitle;
-            }else if(class_exists('SiteConfig')) {
+            } elseif (class_exists('SiteConfig')) {
                 $siteConfig=SiteConfig::current_site_config();
                 $treeTitle=$siteConfig->Title;
-            }else {
+            } else {
                 $treeTitle='...';
             }
             
@@ -507,15 +524,16 @@ public function getSiteTreeFor($className, $rootID=null, $childrenMethod=null, $
      * @param {int} $id ID of the snippet to fetch
      * @return {DataObject} DataObject to use
      */
-    public function getRecord($id) {
+    public function getRecord($id)
+    {
         $className='Snippet';
-        if($className && $id instanceof $className) {
+        if ($className && $id instanceof $className) {
             return $id;
-        }else if($id=='root') {
+        } elseif ($id=='root') {
             return singleton($className);
-        }else if(is_numeric($id)) {
+        } elseif (is_numeric($id)) {
             return DataObject::get_by_id($className, $id);
-        }else {
+        } else {
             return false;
         }
     }
@@ -524,8 +542,9 @@ public function getRecord($id) {
      * Returns the link to view/edit snippets
      * @return {string} Link to view/edit snippets
      */
-    public function getEditLink() {
-        if(!empty($this->urlParams['OtherID']) && is_numeric($this->urlParams['OtherID'])) {
+    public function getEditLink()
+    {
+        if (!empty($this->urlParams['OtherID']) && is_numeric($this->urlParams['OtherID'])) {
             return $this->LinkWithSearch('admin/codeBank/show/'.$this->currentPageID().'/'.intval($this->urlParams['OtherID']));
         }
         
@@ -536,7 +555,8 @@ public function getEditLink() {
      * Returns the link to settings
      * @return {string} Link to settings
      */
-    public function getLinkSettings() {
+    public function getLinkSettings()
+    {
         return $this->LinkWithSearch('admin/codeBank/settings');
     }
     
@@ -544,14 +564,16 @@ public function getLinkSettings() {
      * Detects if a node has snippets or not
      * @return {bool} Returns the value if the language has snippets or not
      */
-    public function hasSnippets($node) {
+    public function hasSnippets($node)
+    {
         return $node->hasSnippets();
     }
     
     /**
      * @return ArrayList
      */
-    public function Breadcrumbs($unlinked=false) {
+    public function Breadcrumbs($unlinked=false)
+    {
         $defaultTitle=LeftAndMain::menu_title_for_class('CodeBank');
         $title=_t('CodeBank.MENUTITLE', $defaultTitle);
         $items=new ArrayList(array(
@@ -562,18 +584,18 @@ public function Breadcrumbs($unlinked=false) {
                                 ));
         
         $record=$this->currentPage();
-        if($record && $record->exists()) {
-            if($record->hasExtension('Hierarchy')) {
+        if ($record && $record->exists()) {
+            if ($record->hasExtension('Hierarchy')) {
                 $ancestors=$record->getAncestors();
                 $ancestors=new ArrayList(array_reverse($ancestors->toArray()));
                 $ancestors->push($record);
-                foreach($ancestors as $ancestor) {
+                foreach ($ancestors as $ancestor) {
                     $items->push(new ArrayData(array(
                                                     'Title'=>$ancestor->Title,
                                                     'Link'=>($unlinked ? false:Controller::join_links($this->Link('show'), $ancestor->ID))
                                                 )));
                 }
-            }else {
+            } else {
                 $items->push(new ArrayData(array(
                                                 'Title'=>$record->Title,
                                                 'Link'=>($unlinked ? false:Controller::join_links($this->Link('show'), $record->ID))
@@ -588,7 +610,8 @@ public function Breadcrumbs($unlinked=false) {
      * Generates the search form
      * @return {Form} Form used for searching
      */
-    public function SearchForm() {
+    public function SearchForm()
+    {
         $languages=SnippetLanguage::get()
                                         ->leftJoin('Snippet', '"Snippet"."LanguageID"="SnippetLanguage"."ID"')
                                         ->where('"SnippetLanguage"."Hidden"=0 OR "Snippet"."ID" IS NOT NULL')
@@ -628,28 +651,29 @@ public function SearchForm() {
      * Gets the current version of Code Bank
      * @return {string} Version Number Plus Build Date
      */
-    final public function getVersion() {
-        if(CB_VERSION!='@@VERSION@@') {
+    final public function getVersion()
+    {
+        if (CB_VERSION!='@@VERSION@@') {
             return CB_VERSION.' '.CB_BUILD_DATE;
         }
         
         // Tries to obtain version number from composer.lock if it exists
         $composerLockPath=BASE_PATH.'/composer.lock';
-        if(file_exists($composerLockPath)) {
+        if (file_exists($composerLockPath)) {
             $cache=SS_Cache::factory('CodeBank_Version');
             $cacheKey=filemtime($composerLockPath);
             $version=$cache->load($cacheKey);
-            if($version) {
+            if ($version) {
                 $version=$version;
-            }else {
+            } else {
                 $version='';
             }
             
-            if(!$version && $jsonData=file_get_contents($composerLockPath)) {
+            if (!$version && $jsonData=file_get_contents($composerLockPath)) {
                 $lockData=json_decode($jsonData);
-                if($lockData && isset($lockData->packages)) {
+                if ($lockData && isset($lockData->packages)) {
                     foreach ($lockData->packages as $package) {
-                        if($package->name=='undefinedoffset/silverstripe-codebank' && isset($package->version)) {
+                        if ($package->name=='undefinedoffset/silverstripe-codebank' && isset($package->version)) {
                             $version=$package->version.(isset($package->time) ? ' '.date('Ymd', strtotime($package->time)):'');
                             break;
                         }
@@ -660,7 +684,7 @@ final public function getVersion() {
             }
         }
         
-        if(!empty($version)) {
+        if (!empty($version)) {
             return $version;
         }
         
@@ -671,24 +695,25 @@ final public function getVersion() {
      * Handles rendering of the compare view
      * @return {string} HTML to be sent to the browser
      */
-    public function compare() {
+    public function compare()
+    {
         $compareContent=false;
         
         
         //Get the Main Revision
         $snippet1=Snippet::get()->byID(intval($this->urlParams['ID']));
-        if(empty($snippet1) || $snippet1===false || $snippet1->ID==0) {
+        if (empty($snippet1) || $snippet1===false || $snippet1->ID==0) {
             $snippet1=false;
         }
         
-        if($snippet1!==false) {
+        if ($snippet1!==false) {
             //Get the Comparision Revision
             $snippet2=$snippet1->Version(intval($this->urlParams['OtherID']));
-            if(empty($snippet2) || $snippet1===false || $snippet2->ID==0) {
+            if (empty($snippet2) || $snippet1===false || $snippet2->ID==0) {
                 $snippet2=false;
             }
             
-            if($snippet2!==false) {
+            if ($snippet2!==false) {
                 $snippet1Text=preg_replace('/\r\n|\n|\r/', "\n", $snippet1->SnippetText);
                 $snippet2Text=preg_replace('/\r\n|\n|\r/', "\n", $snippet2->Text);
                 
@@ -697,7 +722,7 @@ public function compare() {
                 $renderer=new WP_Text_Diff_Renderer_Table();
                 
                 $renderedDiff=$renderer->render($diff);
-                if(!empty($renderedDiff)) {
+                if (!empty($renderedDiff)) {
                     $lTable='<table cellspacing="0" cellpadding="0" border="0" class="diff">'.
                                 '<colgroup>'.
                                     '<col class="ltype"/>'.
@@ -708,17 +733,17 @@ public function compare() {
                     
                     header('content-type: text/plain');
                     $xml=simplexml_load_string('<tbody>'.str_replace('&nbsp;', ' ', $renderedDiff).'</tbody>');
-                    foreach($xml->children() as $row) {
+                    foreach ($xml->children() as $row) {
                         $i=0;
                         $lTable.='<tr>';
                         $rTable.='<tr>';
                         
-                        foreach($row->children() as $td) {
+                        foreach ($row->children() as $td) {
                             $attr=$td->attributes();
                             
-                            if($i==0) {
+                            if ($i==0) {
                                 $lTable.=$td->asXML();
-                            }else {
+                            } else {
                                 $rTable.=$td->asXML();
                             }
                             
@@ -752,40 +777,53 @@ public function compare() {
      * Create serialized JSON string with tree hints data to be injected into 'data-hints' attribute of root node of jsTree.
      * @return {string} Serialized JSON
      */
-    public function getTreeHints() {
+    public function getTreeHints()
+    {
         $json = '';
 
         $classes = array('Snippet', 'SnippetLanguage', 'SnippetFolder');
 
-         $cacheCanCreate = array();
-         foreach($classes as $class) $cacheCanCreate[$class] = singleton($class)->canCreate();
+        $cacheCanCreate = array();
+        foreach ($classes as $class) {
+            $cacheCanCreate[$class] = singleton($class)->canCreate();
+        }
 
          // Generate basic cache key. Too complex to encompass all variations
          $cache=SS_Cache::factory('CodeBank_TreeHints');
-         $cacheKey = md5(implode('_', array(Member::currentUserID(), implode(',', $cacheCanCreate), implode(',', $classes))));
-         if($this->request->getVar('flush')) $cache->clean(Zend_Cache::CLEANING_MODE_ALL);
-         $json = $cache->load($cacheKey);
-         if(!$json) {
+        $cacheKey = md5(implode('_', array(Member::currentUserID(), implode(',', $cacheCanCreate), implode(',', $classes))));
+        if ($this->request->getVar('flush')) {
+            $cache->clean(Zend_Cache::CLEANING_MODE_ALL);
+        }
+        $json = $cache->load($cacheKey);
+        if (!$json) {
             $def['Root'] = array();
             $def['Root']['disallowedParents'] = array();
 
-            foreach($classes as $class) {
+            foreach ($classes as $class) {
                 $sng=singleton($class);
                 $allowedChildren = $sng->allowedChildren();
                 
                 // SiteTree::allowedChildren() returns null rather than an empty array if SiteTree::allowed_chldren == 'none'
-                if($allowedChildren == null) $allowedChildren = array();
+                if ($allowedChildren == null) {
+                    $allowedChildren = array();
+                }
                 
                 // Find i18n - names and build allowed children array
-                foreach($allowedChildren as $child) {
+                foreach ($allowedChildren as $child) {
                     $instance = singleton($child);
                     
-                    if($instance instanceof HiddenClass) continue;
+                    if ($instance instanceof HiddenClass) {
+                        continue;
+                    }
 
-                    if(!array_key_exists($child, $cacheCanCreate) || !$cacheCanCreate[$child]) continue;
+                    if (!array_key_exists($child, $cacheCanCreate) || !$cacheCanCreate[$child]) {
+                        continue;
+                    }
 
                     // skip this type if it is restricted
-                    if($instance->stat('need_permission') && !$this->can(singleton($class)->stat('need_permission'))) continue;
+                    if ($instance->stat('need_permission') && !$this->can(singleton($class)->stat('need_permission'))) {
+                        continue;
+                    }
 
                     $title = $instance->i18n_singular_name();
 
@@ -793,11 +831,15 @@ public function getTreeHints() {
                 }
 
                 $allowedChildren = array_keys(array_diff($classes, $allowedChildren));
-                if($allowedChildren) $def[$class]['disallowedChildren'] = $allowedChildren;
+                if ($allowedChildren) {
+                    $def[$class]['disallowedChildren'] = $allowedChildren;
+                }
                 $defaultChild = $sng->default_child();
-                if($defaultChild != null) $def[$class]['defaultChild'] = $defaultChild;
-                if(isset($def[$class]['disallowedChildren'])) {
-                    foreach($def[$class]['disallowedChildren'] as $disallowedChild) {
+                if ($defaultChild != null) {
+                    $def[$class]['defaultChild'] = $defaultChild;
+                }
+                if (isset($def[$class]['disallowedChildren'])) {
+                    foreach ($def[$class]['disallowedChildren'] as $disallowedChild) {
                         $def[$disallowedChild]['disallowedParents'][] = $class;
                     }
                 }
@@ -816,10 +858,11 @@ public function getTreeHints() {
      * Handles requests to add a snippet or folder to a language
      * @param {SS_HTTPRequest} $request HTTP Request
      */
-    public function addSnippet(SS_HTTPRequest $request)  {
-        if($request->getVar('Type')=='SnippetFolder') {
+    public function addSnippet(SS_HTTPRequest $request)
+    {
+        if ($request->getVar('Type')=='SnippetFolder') {
             return $this->redirect(Controller::join_links($this->Link('addFolder'), '?FolderID='.str_replace('folder-', '', $request->getVar('ID'))));
-        }else {
+        } else {
             return $this->redirect(Controller::join_links($this->Link('add'), '?LanguageID='.str_replace('language-', '', $request->getVar('ID'))));
         }
     }
@@ -828,24 +871,25 @@ public function addSnippet(SS_HTTPRequest $request)  {
      * Handles moving of a snippet when the tree is reordered
      * @param {SS_HTTPRequest} $request HTTP Request
      */
-    public function moveSnippet(SS_HTTPRequest $request) {
+    public function moveSnippet(SS_HTTPRequest $request)
+    {
         $snippet=Snippet::get()->byID(intval($request->getVar('ID')));
         
-        if(empty($snippet) || $snippet===false || $snippet->ID==0) {
+        if (empty($snippet) || $snippet===false || $snippet->ID==0) {
             $this->response->setStatusCode(403, _t('CodeBank.SNIPPIT_NOT_EXIST', '_Snippit does not exist'));
             return;
         }
         
         $parentID=$request->getVar('ParentID');
-        if(strpos($parentID, 'language-')!==false) {
+        if (strpos($parentID, 'language-')!==false) {
             $lang=SnippetLanguage::get()->byID(intval(str_replace('language-', '', $parentID)));
-            if(empty($lang) || $lang===false || $lang->ID==0) {
+            if (empty($lang) || $lang===false || $lang->ID==0) {
                 $this->response->setStatusCode(403, _t('CodeBank.LANGUAGE_NOT_EXIST', '_Language does not exist'));
                 return;
             }
             
             
-            if($lang->ID!=$snippet->LanguageID) {
+            if ($lang->ID!=$snippet->LanguageID) {
                 $this->response->setStatusCode(403, _t('CodeBank.CANNOT_MOVE_TO_LANGUAGE', '_You cannot move a snippet to another language'));
                 return;
             }
@@ -856,15 +900,15 @@ public function moveSnippet(SS_HTTPRequest $request) {
             
             $this->response->addHeader('X-Status', rawurlencode(_t('CodeBank.SNIPPET_MOVED', '_Snippet moved successfully')));
             return;
-        }else if(strpos($parentID, 'folder-')!==false) {
+        } elseif (strpos($parentID, 'folder-')!==false) {
             $folder=SnippetFolder::get()->byID(intval(str_replace('folder-', '', $parentID)));
-            if(empty($folder) || $folder===false || $folder->ID==0) {
+            if (empty($folder) || $folder===false || $folder->ID==0) {
                 $this->response->setStatusCode(403, _t('CodeBank.FOLDER_NOT_EXIST', '_Folder does not exist'));
                 return;
             }
             
             
-            if($folder->LanguageID!=$snippet->LanguageID) {
+            if ($folder->LanguageID!=$snippet->LanguageID) {
                 $this->response->setStatusCode(403, _t('CodeBank.CANNOT_MOVE_TO_FOLDER', '_You cannot move a snippet to a folder in another language'));
                 return;
             }
@@ -884,7 +928,8 @@ public function moveSnippet(SS_HTTPRequest $request) {
      * Handles requests to add a folder
      * @return {string} HTML to be sent to the browser
      */
-    public function addFolder() {
+    public function addFolder()
+    {
         $form=$this->AddFolderForm();
         return $this->customise(array(
                                     'Content'=>' ',
@@ -896,7 +941,8 @@ public function addFolder() {
      * Form used for adding a folder
      * @return {Form} Form to be used for adding a folder
      */
-    public function AddFolderForm() {
+    public function AddFolderForm()
+    {
         $fields=new FieldList(
                             new TabSet('Root',
                                             new Tab('Main', 'Main',
@@ -907,27 +953,27 @@ public function AddFolderForm() {
         
         
         $noParent=true;
-        if(strpos($this->request->getVar('ParentID'), 'language-')!==false) {
+        if (strpos($this->request->getVar('ParentID'), 'language-')!==false) {
             $fields->push(new HiddenField('LanguageID', 'LanguageID', intval(str_replace('language-', '', $this->request->getVar('ParentID')))));
             
             $noParent=false;
-        }else if(strpos($this->request->getVar('ParentID'), 'folder-')!==false) {
+        } elseif (strpos($this->request->getVar('ParentID'), 'folder-')!==false) {
             $folder=SnippetFolder::get()->byID(intval(str_replace('folder-', '', $this->request->getVar('ParentID'))));
             
-            if(!empty($folder) && $folder!==false && $folder->ID!=0) {
+            if (!empty($folder) && $folder!==false && $folder->ID!=0) {
                 $fields->push(new HiddenField('ParentID', 'ParentID', $folder->ID));
                 $fields->push(new HiddenField('LanguageID', 'LanguageID', $folder->LanguageID));
                 
                 $noParent=false;
             }
-        }else {
-            if($this->request->postVar('LanguageID')) {
+        } else {
+            if ($this->request->postVar('LanguageID')) {
                 $fields->push(new HiddenField('LanguageID', 'LanguageID', intval($this->request->postVar('LanguageID'))));
                 
                 $noParent=false;
             }
                
-            if($this->request->postVar('ParentID')) {
+            if ($this->request->postVar('ParentID')) {
                 $fields->push(new HiddenField('ParentID', 'ParentID', intval($this->request->postVar('ParentID'))));
                 
                 $noParent=false;
@@ -946,7 +992,7 @@ public function AddFolderForm() {
         
         
         //If no parent disable folder
-        if($noParent) {
+        if ($noParent) {
             $form->setMessage(_t('CodeBank.FOLDER_NO_PARENT', '_Folder does not have a parent language or folder'), 'bad');
             $form->setFields(new FieldList());
             $form->setActions(new FieldList());
@@ -961,17 +1007,18 @@ public function AddFolderForm() {
      * @param {Form} $form Submitting form
      * @return {string} HTML to be rendered
      */
-    public function doAddFolder($data, Form $form) {
+    public function doAddFolder($data, Form $form)
+    {
         //Existing Check
         $existingCheck=SnippetFolder::get()->filter('Name:nocase', Convert::raw2sql($data['Name']))->filter('LanguageID', intval($data['LanguageID']));
         
-        if(array_key_exists('FolderID', $data)) {
+        if (array_key_exists('FolderID', $data)) {
             $existingCheck=$existingCheck->filter('ParentID', intval($data['FolderID']));
-        }else {
+        } else {
             $existingCheck->filter('ParentID', 0);
         }
         
-        if($existingCheck->Count()>0) {
+        if ($existingCheck->Count()>0) {
             $form->sessionMessage(_t('CodeBank.FOLDER_EXISTS', '_A folder already exists with that name'), 'bad');
             return $this->redirectBack();
         }
@@ -981,7 +1028,7 @@ public function doAddFolder($data, Form $form) {
         $folder->Name=$data['Name'];
         $folder->LanguageID=$data['LanguageID'];
         
-        if(array_key_exists('ParentID', $data)) {
+        if (array_key_exists('ParentID', $data)) {
             $folder->ParentID=$data['ParentID'];
         }
         
@@ -992,7 +1039,7 @@ public function doAddFolder($data, Form $form) {
         //Find the next & previous nodes, for proper positioning (Sort isn't good enough - it's not a raw offset)
         $next=$prev=null;
         $next=SnippetFolder::get()->filter('LanguageID', $folder->LanguageID)->filter('ParentID', $folder->ParentID)->filter('Name:GreaterThan', Convert::raw2sql($folder->Title))->first();
-        if(!$next) {
+        if (!$next) {
             $prev=SnippetFolder::get()->filter('LanguageID', $folder->LanguageID)->filter('ParentID', $folder->ParentID)->filter('Name:LessThan', Convert::raw2sql($folder->Title))->reverse()->first();
         }
         
@@ -1025,7 +1072,8 @@ public function doAddFolder($data, Form $form) {
      * Handles requests to rename a folder
      * @return {string} HTML to be sent to the browser
      */
-    public function renameFolder() {
+    public function renameFolder()
+    {
         $form=$this->RenameFolderForm();
         return $this->customise(array(
                                     'Content'=>' ',
@@ -1037,10 +1085,11 @@ public function renameFolder() {
      * Form used for renaming a folder
      * @return {Form} Form to be used for renaming a folder
      */
-    public function RenameFolderForm() {
+    public function RenameFolderForm()
+    {
         $folder=SnippetFolder::get()->byID(intval(str_replace('folder-', '', $this->request->getVar('ID'))));
         
-        if(!empty($folder) && $folder!==false && $folder->ID!=0) {
+        if (!empty($folder) && $folder!==false && $folder->ID!=0) {
             $fields=new FieldList(
                                 new TabSet('Root',
                                                 new Tab('Main', 'Main',
@@ -1053,7 +1102,7 @@ public function RenameFolderForm() {
             $actions=new FieldList(
                                     new FormAction('doRenameFolder', _t('CodeBank.SAVE', '_Save'))
                                 );
-        }else {
+        } else {
             $fields=new FieldList();
             $actions=new FieldList();
         }
@@ -1065,9 +1114,9 @@ public function RenameFolderForm() {
         
         
         //If no parent disable folder
-        if(empty($folder) || $folder===false || $folder->ID==0) {
+        if (empty($folder) || $folder===false || $folder->ID==0) {
             $form->setMessage(_t('CodeBank.FOLDER_NOT_FOUND', '_Folder could not be found'), 'bad');
-        }else {
+        } else {
             $form->loadDataFrom($folder);
             $form->setFormAction(Controller::join_links($form->FormAction(), '?ID='.$folder->ID));
         }
@@ -1081,9 +1130,10 @@ public function RenameFolderForm() {
      * @param {Form} $form Submitting form
      * @return {string} HTML to be rendered
      */
-    public function doRenameFolder($data, Form $form) {
+    public function doRenameFolder($data, Form $form)
+    {
         $folder=SnippetFolder::get()->byID(intval($data['ID']));
-        if(empty($folder) || $folder===false || $folder->ID==0) {
+        if (empty($folder) || $folder===false || $folder->ID==0) {
             $form->sessionMessage(_t('CodeBank.FOLDER_NOT_FOUND', '_Folder could not be found'), 'bad');
             return $this->redirectBack();
         }
@@ -1094,7 +1144,7 @@ public function doRenameFolder($data, Form $form) {
                                             ->filter('LanguageID', $folder->LanguageID)
                                             ->filter('ParentID', $folder->ParentID)
                                             ->filter('ID:not', $folder->ID);
-        if($existingCheck->Count()>0) {
+        if ($existingCheck->Count()>0) {
             $form->sessionMessage(_t('CodeBank.FOLDER_EXISTS', '_A folder already exists with that name'), 'bad');
             return $this->redirectBack();
         }
@@ -1119,9 +1169,10 @@ public function doRenameFolder($data, Form $form) {
     /**
      * Deletes a folder node
      */
-    public function deleteFolder() {
+    public function deleteFolder()
+    {
         $folder=SnippetFolder::get()->byID(intval(str_replace('folder-', '', $this->request->getVar('ID'))));
-        if(empty($folder) || $folder===false || $folder->ID==0) {
+        if (empty($folder) || $folder===false || $folder->ID==0) {
             $this->response->setStatusCode(404, _t('CodeBank.FOLDER_NOT_FOUND', '_Folder could not be found'));
             return;
         }
@@ -1136,11 +1187,12 @@ public function deleteFolder() {
      * Handles requests to print the current snippet
      * @return {string} Rendered template
      */
-    public function printSnippet() {
+    public function printSnippet()
+    {
         $record=$this->getRecord($this->currentPageID());
-        if(!empty($record) && $record!==false && $record->ID>0) {
+        if (!empty($record) && $record!==false && $record->ID>0) {
             $version=false;
-            if(!empty($this->urlParams['OtherID']) && is_numeric($this->urlParams['OtherID'])) {
+            if (!empty($this->urlParams['OtherID']) && is_numeric($this->urlParams['OtherID'])) {
                 $version=$record->Version(intval($this->urlParams['OtherID']));
             }
             
@@ -1163,7 +1215,8 @@ public function printSnippet() {
      * Returns a map of permission codes to add to the dropdown shown in the Security section of the CMS.
      * @return {array} Map of codes to label
      */
-    public function providePermissions() {
+    public function providePermissions()
+    {
         return array(
                     'CODE_BANK_ACCESS'=>_t('CodeBank.ACCESS_CODE_BANK', '_Access Code Bank')
                 );
@@ -1173,12 +1226,13 @@ public function providePermissions() {
      * Tests to see if the old tables exist
      * @return {bool} Returns boolean true if the old tables are detected and the migration file is not detected
      */
-    protected function hasOldTables() {
-        if(!file_exists(ASSETS_PATH.'/.codeBankMigrated')) {
+    protected function hasOldTables()
+    {
+        if (!file_exists(ASSETS_PATH.'/.codeBankMigrated')) {
             $tables=DB::tableList();
-            if(array_key_exists('snippits', $tables) && array_key_exists('snippit_search', $tables)) {
+            if (array_key_exists('snippits', $tables) && array_key_exists('snippit_search', $tables)) {
                 return true;
-            }else {
+            } else {
                 touch(ASSETS_PATH.'/.codeBankMigrated');
             }
         }
@@ -1187,18 +1241,20 @@ protected function hasOldTables() {
     }
 }
 
-class CodeBank_TreeNode extends LeftAndMain_TreeNode {
+class CodeBank_TreeNode extends LeftAndMain_TreeNode
+{
     /**
      * Returns template, for further processing by {@link Hierarchy->getChildrenAsUL()}. Does not include closing tag to allow this method to inject its own children.
      * @return {string} HTML to be used
      */
-    public function forTemplate() {
+    public function forTemplate()
+    {
         $obj=$this->obj;
-        if($this->obj instanceof SnippetLanguage) {
+        if ($this->obj instanceof SnippetLanguage) {
             $liAttrib='id="language-'.$obj->ID.'" data-id="language-'.$obj->ID.'"';
-        }else if($this->obj instanceof SnippetFolder) {
+        } elseif ($this->obj instanceof SnippetFolder) {
             $liAttrib='id="folder-'.$obj->ID.'" data-id="folder-'.$obj->ID.'" data-languageID="'.$obj->LanguageID.'"';
-        }else {
+        } else {
             $liAttrib='id="record-'.$obj->ID.'" data-id="'.$obj->ID.'" data-languageID="'.$obj->LanguageID.'"';
         }
         
@@ -1208,4 +1264,3 @@ public function forTemplate() {
                 "<ins class=\"jstree-icon\">&nbsp;</ins><span class=\"text\">".($obj->TreeTitle)."</span></a>";
     }
 }
-?>
\ No newline at end of file
diff --git a/code/control/CodeBankAddSnippet.php b/code/control/CodeBankAddSnippet.php
index 08a2208..56c9490 100644
--- a/code/control/CodeBankAddSnippet.php
+++ b/code/control/CodeBankAddSnippet.php
@@ -1,124 +1,128 @@
-<?php
-class CodeBankAddSnippet extends CodeBank {
-    private static $url_segment='codeBank/add';
-    private static $url_rule='/$Action/$ID/$OtherID';
-    private static $url_priority=62;
-    private static $session_namespace='CodeBankAddSnippet';
-    
-    private static $required_permission_codes=array(
-                                                    'CODE_BANK_ACCESS'
-                                                );
-    
-    private static $allowed_actions=array(
-                                        'AddForm',
-                                        'doAdd'
-                                    );
-    
-    
-    /**
-     * Generates the form used for adding snippets
-     * @return {Form} Form used to add snippets
-     */
-    public function AddForm() {
-        $sng=singleton('Snippet');
-        $fields=$sng->getCMSFields();
-        $validator=$sng->getCMSValidator();
-        
-        $actions=new FieldList(
-                                FormAction::create('doAdd', _t('CodeBank.CREATE', '_Create'))->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept')->setUseButtonTag(true)
-                            );
-        
-        $form=CMSForm::create($this, 'AddForm', $fields, $actions)->setHTMLID('Form_AddForm');
-        $form->setValidator($validator);
-        $form->disableDefaultAction();
-        $form->addExtraClass('cms-add-form cms-edit-form');
-        $form->setResponseNegotiator($this->getResponseNegotiator());
-        $form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
-        $form->addExtraClass('center '.$this->BaseCSSClasses());
-        $form->setAttribute('data-pjax-fragment', 'CurrentForm');
-        
-        
-        //Handle Language id in url
-        if($this->request->getVar('LanguageID')) {
-            $langField=$form->Fields()->dataFieldByName('LanguageID');
-            if($langField && $langField->Value()=='') {
-                $langField->setValue(intval(str_replace('language-', '', $this->request->getVar('LanguageID'))));
-            }
-        }
-        
-        
-        //Handle folder id in url (or post)
-        if($this->request->getVar('FolderID')) {
-            $folder=SnippetFolder::get()->byID(intval($this->request->getVar('FolderID')));
-            if(!empty($folder) && $folder!==false && $folder->ID!=0) {
-                $langField=$form->Fields()->dataFieldByName('LanguageID')->setValue($folder->ParentID);
-                $form->Fields()->replaceField('LanguageID', $langField->performReadonlyTransformation());
-                $form->Fields()->push(new HiddenField('FolderID', 'FolderID', $folder->ID));
-            }
-        }else if($this->request->postVar('FolderID')) {
-            $folder=SnippetFolder::get()->byID(intval($this->request->postVar('FolderID')));
-            if(!empty($folder) && $folder!==false && $folder->ID!=0) {
-                $langField=$form->Fields()->dataFieldByName('LanguageID')->setValue($folder->ParentID);
-                $form->Fields()->replaceField('LanguageID', $langField->performReadonlyTransformation());
-                $form->Fields()->push(new HiddenField('FolderID', 'FolderID', $folder->ID));
-            }
-        }
-        
-        
-        $this->extend('updateAddForm', $form);
-        
-        
-        //Display message telling user to run dev/build because the version numbers are out of sync
-        if(CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
-            $form->insertBefore(new LiteralField('<p class="message error">'._t('CodeBank.UPDATE_NEEDED', '_A database upgrade is required please run {startlink}dev/build{endlink}.', array('startlink'=>'<a href="dev/build?flush=all">', 'endlink'=>'</a>')).'</p>'), 'LanguageID');
-        }else if($this->hasOldTables()) {
-            $form->insertBefore(new LiteralField('<p class="message warning">'._t('CodeBank.MIGRATION_AVAILABLE', '_It appears you are upgrading from Code Bank 2.2.x, your old data can be migrated {startlink}click here to begin{endlink}, though it is recommended you backup your database first.', array('startlink'=>'<a href="dev/tasks/CodeBankLegacyMigrate">', 'endlink'=>'</a>')).'</p>'), 'LanguageID');
-        }
-        
-        $form->Actions()->push(new LiteralField('CodeBankVersion', '<p class="codeBankVersion">Code Bank: '.$this->getVersion().'</p>'));
-        
-        
-        Requirements::javascript(CB_DIR.'/javascript/CodeBank.EditForm.js');
-        
-        return $form;
-    }
-    
-    /**
-     * Handles adding the snippet to the database
-     * @param {array} $data Data submitted by the user
-     * @param {Form} $form Form submitted
-     */
-    public function doAdd($data, Form $form) {
-        $record=$this->getRecord(null);
-        $form->saveInto($record);
-        $record->write();
-        
-        $editController=singleton('CodeBank');
-        $editController->setCurrentPageID($record->ID);
-        
-        return $this->redirect(Controller::join_links(singleton('CodeBank')->Link('show'), $record->ID));
-    }
-    
-    /**
-     * Gets an empty snippet to be loaded
-     * @return {Snippet} Empty snippet record
-     */
-    public function getRecord($id) {
-        return new Snippet();
-    }
-    
-    public function Breadcrumbs($unlinked=false) {
-        $defaultTitle=self::menu_title_for_class(get_class($this));
-        return new ArrayList(array(
-                                    new ArrayData(array(
-                                                        'Title'=>_t('CodeBank.MENUTITLE', '_Code Bank'),
-                                                        'Link'=>$this->LinkMain
-                                                    )),
-                                    new ArrayData(array(
-                                                        'Title'=>_t("{$this->class}.MENUTITLE", $defaultTitle),
-                                                        'Link'=>false
-                                                    ))
-                                ));
-    }
-}
-?>
\ No newline at end of file
+<?php
+class CodeBankAddSnippet extends CodeBank
+{
+    private static $url_segment='codeBank/add';
+    private static $url_rule='/$Action/$ID/$OtherID';
+    private static $url_priority=62;
+    private static $session_namespace='CodeBankAddSnippet';
+    
+    private static $required_permission_codes=array(
+                                                    'CODE_BANK_ACCESS'
+                                                );
+    
+    private static $allowed_actions=array(
+                                        'AddForm',
+                                        'doAdd'
+                                    );
+    
+    
+    /**
+     * Generates the form used for adding snippets
+     * @return {Form} Form used to add snippets
+     */
+    public function AddForm()
+    {
+        $sng=singleton('Snippet');
+        $fields=$sng->getCMSFields();
+        $validator=$sng->getCMSValidator();
+        
+        $actions=new FieldList(
+                                FormAction::create('doAdd', _t('CodeBank.CREATE', '_Create'))->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept')->setUseButtonTag(true)
+                            );
+        
+        $form=CMSForm::create($this, 'AddForm', $fields, $actions)->setHTMLID('Form_AddForm');
+        $form->setValidator($validator);
+        $form->disableDefaultAction();
+        $form->addExtraClass('cms-add-form cms-edit-form');
+        $form->setResponseNegotiator($this->getResponseNegotiator());
+        $form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
+        $form->addExtraClass('center '.$this->BaseCSSClasses());
+        $form->setAttribute('data-pjax-fragment', 'CurrentForm');
+        
+        
+        //Handle Language id in url
+        if ($this->request->getVar('LanguageID')) {
+            $langField=$form->Fields()->dataFieldByName('LanguageID');
+            if ($langField && $langField->Value()=='') {
+                $langField->setValue(intval(str_replace('language-', '', $this->request->getVar('LanguageID'))));
+            }
+        }
+        
+        
+        //Handle folder id in url (or post)
+        if ($this->request->getVar('FolderID')) {
+            $folder=SnippetFolder::get()->byID(intval($this->request->getVar('FolderID')));
+            if (!empty($folder) && $folder!==false && $folder->ID!=0) {
+                $langField=$form->Fields()->dataFieldByName('LanguageID')->setValue($folder->ParentID);
+                $form->Fields()->replaceField('LanguageID', $langField->performReadonlyTransformation());
+                $form->Fields()->push(new HiddenField('FolderID', 'FolderID', $folder->ID));
+            }
+        } elseif ($this->request->postVar('FolderID')) {
+            $folder=SnippetFolder::get()->byID(intval($this->request->postVar('FolderID')));
+            if (!empty($folder) && $folder!==false && $folder->ID!=0) {
+                $langField=$form->Fields()->dataFieldByName('LanguageID')->setValue($folder->ParentID);
+                $form->Fields()->replaceField('LanguageID', $langField->performReadonlyTransformation());
+                $form->Fields()->push(new HiddenField('FolderID', 'FolderID', $folder->ID));
+            }
+        }
+        
+        
+        $this->extend('updateAddForm', $form);
+        
+        
+        //Display message telling user to run dev/build because the version numbers are out of sync
+        if (CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
+            $form->insertBefore(new LiteralField('<p class="message error">'._t('CodeBank.UPDATE_NEEDED', '_A database upgrade is required please run {startlink}dev/build{endlink}.', array('startlink'=>'<a href="dev/build?flush=all">', 'endlink'=>'</a>')).'</p>'), 'LanguageID');
+        } elseif ($this->hasOldTables()) {
+            $form->insertBefore(new LiteralField('<p class="message warning">'._t('CodeBank.MIGRATION_AVAILABLE', '_It appears you are upgrading from Code Bank 2.2.x, your old data can be migrated {startlink}click here to begin{endlink}, though it is recommended you backup your database first.', array('startlink'=>'<a href="dev/tasks/CodeBankLegacyMigrate">', 'endlink'=>'</a>')).'</p>'), 'LanguageID');
+        }
+        
+        $form->Actions()->push(new LiteralField('CodeBankVersion', '<p class="codeBankVersion">Code Bank: '.$this->getVersion().'</p>'));
+        
+        
+        Requirements::javascript(CB_DIR.'/javascript/CodeBank.EditForm.js');
+        
+        return $form;
+    }
+    
+    /**
+     * Handles adding the snippet to the database
+     * @param {array} $data Data submitted by the user
+     * @param {Form} $form Form submitted
+     */
+    public function doAdd($data, Form $form)
+    {
+        $record=$this->getRecord(null);
+        $form->saveInto($record);
+        $record->write();
+        
+        $editController=singleton('CodeBank');
+        $editController->setCurrentPageID($record->ID);
+        
+        return $this->redirect(Controller::join_links(singleton('CodeBank')->Link('show'), $record->ID));
+    }
+    
+    /**
+     * Gets an empty snippet to be loaded
+     * @return {Snippet} Empty snippet record
+     */
+    public function getRecord($id)
+    {
+        return new Snippet();
+    }
+    
+    public function Breadcrumbs($unlinked=false)
+    {
+        $defaultTitle=self::menu_title_for_class(get_class($this));
+        return new ArrayList(array(
+                                    new ArrayData(array(
+                                                        'Title'=>_t('CodeBank.MENUTITLE', '_Code Bank'),
+                                                        'Link'=>$this->LinkMain
+                                                    )),
+                                    new ArrayData(array(
+                                                        'Title'=>_t("{$this->class}.MENUTITLE", $defaultTitle),
+                                                        'Link'=>false
+                                                    ))
+                                ));
+    }
+}
diff --git a/code/control/CodeBankClientAPI.php b/code/control/CodeBankClientAPI.php
index fcc6dfa..d4214d8 100644
--- a/code/control/CodeBankClientAPI.php
+++ b/code/control/CodeBankClientAPI.php
@@ -1,5 +1,6 @@
 <?php
-class CodeBank_ClientAPI extends Controller {
+class CodeBank_ClientAPI extends Controller
+{
     private static $allowed_actions=array(
                                         'index',
                                         'export_package',
@@ -9,7 +10,8 @@ class CodeBank_ClientAPI extends Controller {
     
     private $_testAMFRequest=false;
     
-    public function init() {
+    public function init()
+    {
         parent::init();
         
         ContentNegotiator::disable();
@@ -18,7 +20,8 @@ public function init() {
     /**
      * Handles all amf requests
      */
-    public function index() {
+    public function index()
+    {
         //Ensure the session is started
         Session::start();
         
@@ -27,30 +30,30 @@ public function index() {
         
         //Initialize the server classes
         $classes=ClassInfo::implementorsOf('CodeBank_APIClass');
-        foreach($classes as $class) {
+        foreach ($classes as $class) {
             //Set the class to be active in the server
             $server->setClass($class);
         }
         
         //Enable Service Browser if in dev mode
-        if(Director::isDev()) {
+        if (Director::isDev()) {
             $server->setClass('ZendAmfServiceBrowser');
             ZendAmfServiceBrowser::$ZEND_AMF_SERVER=$server;
         }
         
-        if(class_exists('CodeBankAPITest') && $this->_testAMFRequest!==false) {
+        if (class_exists('CodeBankAPITest') && $this->_testAMFRequest!==false) {
             $server->setRequest($this->_testAMFRequest);
             $server->setResponse(new Zend_Amf_Response());
         }
         
         $server->setProduction(!Director::isDev()); //Server debug, bind to opposite of Director::isDev()
-        
+
         //Start the response
         $response=$server->handle();
         
         
         //If not in test mode add the application/x-amf content type
-        if(!class_exists('CodeBankAPITest')) {
+        if (!class_exists('CodeBankAPITest')) {
             $this->response->addHeader('Content-Type', 'application/x-amf');
         }
         
@@ -66,14 +69,15 @@ public function index() {
      * Handles exporting of snippets
      * @param {SS_HTTPRequest} $request HTTP Request Data
      */
-    public function export_snippet(SS_HTTPRequest $request) {
-        if($request->getVar('s')) {
+    public function export_snippet(SS_HTTPRequest $request)
+    {
+        if ($request->getVar('s')) {
             //Use the session id in the request
             Session::start($request->getVar('s'));
         }
         
         
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             header("HTTP/1.1 401 Unauthorized");
             
             
@@ -85,7 +89,7 @@ public function export_snippet(SS_HTTPRequest $request) {
         
         try {
             $snippet=Snippet::get()->byID(intval($request->getVar('id')));
-            if(empty($snippet) || $snippet===false || $snippet->ID==0) {
+            if (empty($snippet) || $snippet===false || $snippet->ID==0) {
                 header("HTTP/1.1 404 Not Found");
                 
                 
@@ -100,52 +104,52 @@ public function export_snippet(SS_HTTPRequest $request) {
             
             
             //If the temp dir doesn't exist create it
-            if(!file_exists(ASSETS_PATH.'/.codeBankTemp')) {
+            if (!file_exists(ASSETS_PATH.'/.codeBankTemp')) {
                 mkdir(ASSETS_PATH.'/.codeBankTemp', Config::inst()->get('Filesystem', 'folder_create_mask'));
             }
             
             
-            if($snippet->Language()->Name=='ActionScript 3') {
+            if ($snippet->Language()->Name=='ActionScript 3') {
                 $zip=new ZipArchive();
                 
                 $res=$zip->open(ASSETS_PATH.'/.codeBankTemp/'.$fileID.'.zip', ZIPARCHIVE::CREATE);
                 
-                if($res===true) {
+                if ($res===true) {
                     $path='';
                     $text=preg_split("/[\n\r]/", $snippet->getSnippetText());
                     $folder=str_replace('.', '/', trim(preg_replace('/^package (.*?)((\s*)\{)?$/i', '\\1', $text[0])));
                     
                     $className=array_values(preg_grep('/(\s*|\t*)public(\s+)class(\s+)(.*?)(\s*)((extends|implements)(.*?)(\s*))*\{/i', $text));
                     
-                    if(count($className)==0) {
+                    if (count($className)==0) {
                         throw new Exception('Class definition could not be found');
                     }
                     
-                    $className=trim(preg_replace('/(\s*|\t*)public(\s+)class(\s+)(.*?)(\s*)((extends|implements)(.*?)(\s*))*\{/i','\\4', $className[0]));
+                    $className=trim(preg_replace('/(\s*|\t*)public(\s+)class(\s+)(.*?)(\s*)((extends|implements)(.*?)(\s*))*\{/i', '\\4', $className[0]));
                     
-                    if($className=="") {
+                    if ($className=="") {
                         throw new Exception('Class definition could not be found');
                     }
                     
                     $zip->addFromString($folder.'/'.$className.'.'.$snippet->Language()->FileExtension, $snippet->getSnippetText());
                     
-                    if($zip->Close()!==false) {
-                        chmod(ASSETS_PATH.'/.codeBankTemp/'.$fileID.'.zip',0600);
+                    if ($zip->Close()!==false) {
+                        chmod(ASSETS_PATH.'/.codeBankTemp/'.$fileID.'.zip', 0600);
                         
                         
                         //Send File
                         SS_HTTPRequest::send_file(file_get_contents(ASSETS_PATH.'/.codeBankTemp/'.$fileID.'.zip'), $fileID.'.zip', 'application/octet-stream')->output();
                         unlink(ASSETS_PATH.'/.codeBankTemp/'.$fileID.'.zip');
-                    }else {
+                    } else {
                         header("HTTP/1.1 500 Internal Server Error");
                     }
-                }else {
+                } else {
                     header("HTTP/1.1 500 Internal Server Error");
                 }
-            }else {
+            } else {
                 SS_HTTPRequest::send_file($snippet->getSnippetText(), $fileID.'.'.$snippet->Language()->FileExtension, 'text/plain')->output();
             }
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             header("HTTP/1.1 500 Internal Server Error");
         }
         
@@ -158,8 +162,9 @@ public function export_snippet(SS_HTTPRequest $request) {
     /**
      * Builds a json export file for importing on the client
      */
-    public function export_to_client() {
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+    public function export_to_client()
+    {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             return Security::permissionFailure($this);
         }
         
@@ -202,14 +207,15 @@ public function export_to_client() {
      * Handles exporting of snippets
      * @param {SS_HTTPRequest} $request HTTP Request Data
      */
-    public function export_package(SS_HTTPRequest $request) {
-        if($request->getVar('s')) {
+    public function export_package(SS_HTTPRequest $request)
+    {
+        if ($request->getVar('s')) {
             //Use the session id in the request
             Session::start($request->getVar('s'));
         }
         
         
-        if(!Permission::check('CODE_BANK_ACCESS')) {
+        if (!Permission::check('CODE_BANK_ACCESS')) {
             header("HTTP/1.1 401 Unauthorized");
             
             
@@ -221,7 +227,7 @@ public function export_package(SS_HTTPRequest $request) {
         
         try {
             $package=SnippetPackage::get()->byID(intval($request->getVar('id')));
-            if(empty($package) || $package===false || $package->ID==0) {
+            if (empty($package) || $package===false || $package->ID==0) {
                 header("HTTP/1.1 404 Not Found");
                 
                 
@@ -236,7 +242,7 @@ public function export_package(SS_HTTPRequest $request) {
             
             
             //If the temp dir doesn't exist create it
-            if(!file_exists(ASSETS_PATH.'/.codeBankTemp')) {
+            if (!file_exists(ASSETS_PATH.'/.codeBankTemp')) {
                 mkdir(ASSETS_PATH.'/.codeBankTemp', Config::inst()->get('Filesystem', 'folder_create_mask'));
             }
             
@@ -244,49 +250,49 @@ public function export_package(SS_HTTPRequest $request) {
             $zip=new ZipArchive();
             $res=$zip->open(ASSETS_PATH.'/.codeBankTemp/package-'.$fileID.'.zip', ZIPARCHIVE::CREATE);
             
-            if($res===true) {
+            if ($res===true) {
                 $snippets=$package->Snippets();
                 
-                foreach($snippets as $snippet) {
+                foreach ($snippets as $snippet) {
                     $snipFileID=$urlFilter->filter($snippet->Title);
                     
-                    if($snippet->Language()->Name=='ActionScript 3') {
+                    if ($snippet->Language()->Name=='ActionScript 3') {
                         $path='';
                         $text=preg_split("/[\n\r]/", $snippet->getSnippetText());
                         $folder=str_replace('.', '/', trim(preg_replace('/^package (.*?)((\s*)\{)?$/i', '\\1', $text[0])));
                         
                         $className=array_values(preg_grep('/(\s*|\t*)public(\s+)class(\s+)(.*?)(\s*)((extends|implements)(.*?)(\s*))*\{/i', $text));
                         
-                        if(count($className)==0) {
+                        if (count($className)==0) {
                             throw new Exception('Class definition could not be found');
                         }
                         
-                        $className=trim(preg_replace('/(\s*|\t*)public(\s+)class(\s+)(.*?)(\s*)((extends|implements)(.*?)(\s*))*\{/i','\\4', $className[0]));
+                        $className=trim(preg_replace('/(\s*|\t*)public(\s+)class(\s+)(.*?)(\s*)((extends|implements)(.*?)(\s*))*\{/i', '\\4', $className[0]));
                         
-                        if($className=="") {
+                        if ($className=="") {
                             throw new Exception('Class definition could not be found');
                         }
                         
                         $zip->addFromString($folder.'/'.$className.'.'.$snippet->Language()->FileExtension, $snippet->getSnippetText());
-                    }else {
+                    } else {
                         $zip->addFromString($snipFileID.'.'.$snippet->Language()->FileExtension, $snippet->getSnippetText());
                     }
                 }
                 
-                if($zip->Close()!==false) {
-                    chmod(ASSETS_PATH.'/.codeBankTemp/package-'.$fileID.'.zip',0600);
+                if ($zip->Close()!==false) {
+                    chmod(ASSETS_PATH.'/.codeBankTemp/package-'.$fileID.'.zip', 0600);
                     
                     
                     //Send File
                     SS_HTTPRequest::send_file(file_get_contents(ASSETS_PATH.'/.codeBankTemp/package-'.$fileID.'.zip'), $fileID.'.zip', 'application/octet-stream')->output();
                     unlink(ASSETS_PATH.'/.codeBankTemp/package-'.$fileID.'.zip');
-                }else {
+                } else {
                     header("HTTP/1.1 500 Internal Server Error");
                 }
-            }else {
+            } else {
                 header("HTTP/1.1 500 Internal Server Error");
             }
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             header("HTTP/1.1 500 Internal Server Error");
         }
         
@@ -300,7 +306,8 @@ public function export_package(SS_HTTPRequest $request) {
      * Gets the base response array
      * @return {array} Default response array
      */
-    public static function responseBase() {
+    public static function responseBase()
+    {
         $responseBase=array(
                             'session'=>'',
                             'login'=>false,
@@ -318,8 +325,9 @@ public static function responseBase() {
      * Implented for test only, sets the request to pass to the amf server
      * @param {Test_Amf_Request} $request Test AMF Request
      */
-    public function setTestRequest(Zend_Amf_Request $request) {
-        if(class_exists('CodeBankAPITest')) {
+    public function setTestRequest(Zend_Amf_Request $request)
+    {
+        if (class_exists('CodeBankAPITest')) {
             $this->_testAMFRequest=$request;
         }
     }
@@ -329,14 +337,14 @@ public function setTestRequest(Zend_Amf_Request $request) {
      * @param {SS_Query} $source SS_Query containing the result set
      * @return {array} Merged array
      */
-    private function queryToArray(SS_Query $source) {
+    private function queryToArray(SS_Query $source)
+    {
         $result=array();
         
-        foreach($source as $row) {
+        foreach ($source as $row) {
             $result[]=$row;
         }
         
         return $result;
     }
 }
-?>
\ No newline at end of file
diff --git a/code/control/CodeBankEditSnippet.php b/code/control/CodeBankEditSnippet.php
index c3d3b2e..5d19551 100644
--- a/code/control/CodeBankEditSnippet.php
+++ b/code/control/CodeBankEditSnippet.php
@@ -1,171 +1,175 @@
-<?php
-class CodeBankEditSnippet extends CodeBank {
-    private static $url_segment='codeBank/edit';
-    private static $url_rule='/$Action/$ID/$OtherID';
-    private static $url_priority=61;
-    private static $session_namespace='CodeBankEditSnippet';
-    
-    private static $required_permission_codes=array(
-                                                    'CODE_BANK_ACCESS'
-                                                );
-    
-    private static $allowed_actions=array(
-                                        'index',
-                                        'tree',
-                                        'show',
-                                        'EditForm',
-                                        'moveSnippet',
-                                        'savetreenode',
-                                        'getsubtree',
-                                        'moveSnippet'
-                                    );
-    
-    /**
-     * Gets the form used for viewing snippets
-     * @param {int} $id ID of the record to fetch
-     * @param {FieldList} $fields Fields to use
-     * @return {Form} Form to be used
-     */
-    public function getEditForm($id=null, $fields=null) {
-        if(!$id) {
-            $id=$this->currentPageID();
-        }
-        
-        
-        $record=$this->getRecord($id);
-        if($record && !$record->canView()) {
-            return Security::permissionFailure($this);
-        }
-        
-        
-        
-        if($record) {
-            $fields=$record->getCMSFields();
-            $actions=new FieldList(
-                                    FormAction::create('doSave', _t('CodeBank.SAVE', '_Save'))->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept'),
-                                    FormAction::create('doCancel', _t('CodeBank.CANCEL', '_Cancel'))
-                                );
-            
-            
-            if($record->canDelete()) {
-                $actions->push(FormAction::create('doDelete', _t('CodeBank.DELETE', '_Delete'))->addExtraClass('ss-ui-action-destructive'));
-            }
-            
-            
-            // Use <button> to allow full jQuery UI styling
-            $actionsFlattened=$actions->dataFields();
-            if($actionsFlattened) {
-                foreach($actionsFlattened as $action) {
-                    if($action instanceof FormAction) {
-                        $action->setUseButtonTag(true);
-                    }
-                }
-            }
-            
-            
-            if($record->hasMethod('getCMSValidator')) {
-                $validator=$record->getCMSValidator();
-            }else {
-                $validator=new RequiredFields();
-            }
-            
-            
-            $fields->push(new HiddenField('ID', 'ID'));
-            
-            $form=CMSForm::create($this, 'EditForm', $fields, $actions, $validator)->setHTMLID('Form_EditForm');
-            $form->loadDataFrom($record);
-            $form->disableDefaultAction();
-            $form->addExtraClass('cms-edit-form');
-            $form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
-            $form->addExtraClass('center '.$this->BaseCSSClasses());
-            $form->setResponseNegotiator($this->getResponseNegotiator());
-            $form->setAttribute('data-pjax-fragment', 'CurrentForm');
-            
-            
-            $this->extend('updateEditForm', $form);
-            
-            
-            //Display message telling user to run dev/build because the version numbers are out of sync
-            if(CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
-                $form->insertBefore(new LiteralField('<p class="message error">'._t('CodeBank.UPDATE_NEEDED', '_A database upgrade is required please run {startlink}dev/build{endlink}.', array('startlink'=>'<a href="dev/build?flush=all">', 'endlink'=>'</a>')).'</p>'), 'LanguageID');
-            }else if($this->hasOldTables()) {
-                $form->insertBefore(new LiteralField('<p class="message warning">'._t('CodeBank.MIGRATION_AVAILABLE', '_It appears you are upgrading from Code Bank 2.2.x, your old data can be migrated {startlink}click here to begin{endlink}, though it is recommended you backup your database first.', array('startlink'=>'<a href="dev/tasks/CodeBankLegacyMigrate">', 'endlink'=>'</a>')).'</p>'), 'LanguageID');
-            }
-            
-            $form->Actions()->push(new LiteralField('CodeBankVersion', '<p class="codeBankVersion">Code Bank: '.$this->getVersion().'</p>'));
-            
-            
-            Requirements::javascript(CB_DIR.'/javascript/CodeBank.EditForm.js');
-            
-            return $form;
-        }
-        
-        $form=$this->EmptyForm();
-        if(Session::get('CodeBank.deletedSnippetID')) {
-            $form->Fields()->push(new HiddenField('ID', 'ID', Session::get('CodeBank.deletedSnippetID')));
-        }
-        
-        
-        //Display message telling user to run dev/build because the version numbers are out of sync
-        if(CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
-            $form->push(new LiteralField('<p class="message error">'._t('CodeBank.UPDATE_NEEDED', '_A database upgrade is required please run {startlink}dev/build{endlink}.', array('startlink'=>'<a href="dev/build?flush=all">', 'endlink'=>'</a>')).'</p>'));
-        }else if($this->hasOldTables()) {
-            $form->push(new LiteralField('<p class="message warning">'._t('CodeBank.MIGRATION_AVAILABLE', '_It appears you are upgrading from Code Bank 2.2.x, your old data can be migrated {startlink}click here to begin{endlink}, though it is recommended you backup your database first.', array('startlink'=>'<a href="dev/tasks/CodeBankLegacyMigrate">', 'endlink'=>'</a>')).'</p>'));
-        }
-        
-        $this->redirect('admin/codeBank/');
-        return $form;
-    }
-    
-    /**
-     * Returns the link to view/edit snippets
-     * @return {string} Link to view/edit snippets
-     */
-    public function getEditLink() {
-        return 'admin/codeBank/edit/show/'.$this->currentPageID();
-    }
-    
-    /**
-     * Saves the snippet to the database
-     * @param {array} $data Data submitted by the user
-     * @param {Form} $form Submitting form
-     * @return {SS_HTTPResponse} Response
-     */
-    public function doSave($data, Form $form) {
-        $record=$this->currentPage();
-        
-        if($record->canEdit()) {
-            $form->saveInto($record);
-            $record->write();
-            
-            $this->response->addHeader('X-Status', rawurlencode(_t('CodeBank.SNIPPET_SAVED', '_Snippet has been saved')));
-        }else {
-            $this->response->addHeader('X-Status', rawurlencode(_t('CodeBank.PERMISSION_DENIED', '_Permission Denied')));
-        }
-        
-        return $this->getResponseNegotiator()->respond($this->request);
-    }
-    
-    /**
-     * Deletes the snippet from the database
-     * @param {array} $data Data submitted by the user
-     * @param {Form} $form Submitting form
-     * @return {SS_HTTPResponse} Response
-     */
-    public function doDelete($data, Form $form) {
-        $record=$this->currentPage();
-    
-        if($record->canDelete()) {
-            Session::set('CodeBank.deletedSnippetID', $record->ID);
-            $record->delete();
-    
-            $this->response->addHeader('X-Status', rawurlencode(_t('CodeBank.SNIPPET_DELETED', '_Snippet has been deleted')));
-        }else {
-            $this->response->addHeader('X-Status', rawurlencode(_t('CodeBank.PERMISSION_DENIED', '_Permission Denied')));
-        }
-        
-        $this->redirect('admin/codeBank/');
-        return $this->getResponseNegotiator()->respond($this->request);
-    }
-}
-?>
\ No newline at end of file
+<?php
+class CodeBankEditSnippet extends CodeBank
+{
+    private static $url_segment='codeBank/edit';
+    private static $url_rule='/$Action/$ID/$OtherID';
+    private static $url_priority=61;
+    private static $session_namespace='CodeBankEditSnippet';
+    
+    private static $required_permission_codes=array(
+                                                    'CODE_BANK_ACCESS'
+                                                );
+    
+    private static $allowed_actions=array(
+                                        'index',
+                                        'tree',
+                                        'show',
+                                        'EditForm',
+                                        'moveSnippet',
+                                        'savetreenode',
+                                        'getsubtree',
+                                        'moveSnippet'
+                                    );
+    
+    /**
+     * Gets the form used for viewing snippets
+     * @param {int} $id ID of the record to fetch
+     * @param {FieldList} $fields Fields to use
+     * @return {Form} Form to be used
+     */
+    public function getEditForm($id=null, $fields=null)
+    {
+        if (!$id) {
+            $id=$this->currentPageID();
+        }
+        
+        
+        $record=$this->getRecord($id);
+        if ($record && !$record->canView()) {
+            return Security::permissionFailure($this);
+        }
+        
+        
+        
+        if ($record) {
+            $fields=$record->getCMSFields();
+            $actions=new FieldList(
+                                    FormAction::create('doSave', _t('CodeBank.SAVE', '_Save'))->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept'),
+                                    FormAction::create('doCancel', _t('CodeBank.CANCEL', '_Cancel'))
+                                );
+            
+            
+            if ($record->canDelete()) {
+                $actions->push(FormAction::create('doDelete', _t('CodeBank.DELETE', '_Delete'))->addExtraClass('ss-ui-action-destructive'));
+            }
+            
+            
+            // Use <button> to allow full jQuery UI styling
+            $actionsFlattened=$actions->dataFields();
+            if ($actionsFlattened) {
+                foreach ($actionsFlattened as $action) {
+                    if ($action instanceof FormAction) {
+                        $action->setUseButtonTag(true);
+                    }
+                }
+            }
+            
+            
+            if ($record->hasMethod('getCMSValidator')) {
+                $validator=$record->getCMSValidator();
+            } else {
+                $validator=new RequiredFields();
+            }
+            
+            
+            $fields->push(new HiddenField('ID', 'ID'));
+            
+            $form=CMSForm::create($this, 'EditForm', $fields, $actions, $validator)->setHTMLID('Form_EditForm');
+            $form->loadDataFrom($record);
+            $form->disableDefaultAction();
+            $form->addExtraClass('cms-edit-form');
+            $form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
+            $form->addExtraClass('center '.$this->BaseCSSClasses());
+            $form->setResponseNegotiator($this->getResponseNegotiator());
+            $form->setAttribute('data-pjax-fragment', 'CurrentForm');
+            
+            
+            $this->extend('updateEditForm', $form);
+            
+            
+            //Display message telling user to run dev/build because the version numbers are out of sync
+            if (CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
+                $form->insertBefore(new LiteralField('<p class="message error">'._t('CodeBank.UPDATE_NEEDED', '_A database upgrade is required please run {startlink}dev/build{endlink}.', array('startlink'=>'<a href="dev/build?flush=all">', 'endlink'=>'</a>')).'</p>'), 'LanguageID');
+            } elseif ($this->hasOldTables()) {
+                $form->insertBefore(new LiteralField('<p class="message warning">'._t('CodeBank.MIGRATION_AVAILABLE', '_It appears you are upgrading from Code Bank 2.2.x, your old data can be migrated {startlink}click here to begin{endlink}, though it is recommended you backup your database first.', array('startlink'=>'<a href="dev/tasks/CodeBankLegacyMigrate">', 'endlink'=>'</a>')).'</p>'), 'LanguageID');
+            }
+            
+            $form->Actions()->push(new LiteralField('CodeBankVersion', '<p class="codeBankVersion">Code Bank: '.$this->getVersion().'</p>'));
+            
+            
+            Requirements::javascript(CB_DIR.'/javascript/CodeBank.EditForm.js');
+            
+            return $form;
+        }
+        
+        $form=$this->EmptyForm();
+        if (Session::get('CodeBank.deletedSnippetID')) {
+            $form->Fields()->push(new HiddenField('ID', 'ID', Session::get('CodeBank.deletedSnippetID')));
+        }
+        
+        
+        //Display message telling user to run dev/build because the version numbers are out of sync
+        if (CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
+            $form->push(new LiteralField('<p class="message error">'._t('CodeBank.UPDATE_NEEDED', '_A database upgrade is required please run {startlink}dev/build{endlink}.', array('startlink'=>'<a href="dev/build?flush=all">', 'endlink'=>'</a>')).'</p>'));
+        } elseif ($this->hasOldTables()) {
+            $form->push(new LiteralField('<p class="message warning">'._t('CodeBank.MIGRATION_AVAILABLE', '_It appears you are upgrading from Code Bank 2.2.x, your old data can be migrated {startlink}click here to begin{endlink}, though it is recommended you backup your database first.', array('startlink'=>'<a href="dev/tasks/CodeBankLegacyMigrate">', 'endlink'=>'</a>')).'</p>'));
+        }
+        
+        $this->redirect('admin/codeBank/');
+        return $form;
+    }
+    
+    /**
+     * Returns the link to view/edit snippets
+     * @return {string} Link to view/edit snippets
+     */
+    public function getEditLink()
+    {
+        return 'admin/codeBank/edit/show/'.$this->currentPageID();
+    }
+    
+    /**
+     * Saves the snippet to the database
+     * @param {array} $data Data submitted by the user
+     * @param {Form} $form Submitting form
+     * @return {SS_HTTPResponse} Response
+     */
+    public function doSave($data, Form $form)
+    {
+        $record=$this->currentPage();
+        
+        if ($record->canEdit()) {
+            $form->saveInto($record);
+            $record->write();
+            
+            $this->response->addHeader('X-Status', rawurlencode(_t('CodeBank.SNIPPET_SAVED', '_Snippet has been saved')));
+        } else {
+            $this->response->addHeader('X-Status', rawurlencode(_t('CodeBank.PERMISSION_DENIED', '_Permission Denied')));
+        }
+        
+        return $this->getResponseNegotiator()->respond($this->request);
+    }
+    
+    /**
+     * Deletes the snippet from the database
+     * @param {array} $data Data submitted by the user
+     * @param {Form} $form Submitting form
+     * @return {SS_HTTPResponse} Response
+     */
+    public function doDelete($data, Form $form)
+    {
+        $record=$this->currentPage();
+    
+        if ($record->canDelete()) {
+            Session::set('CodeBank.deletedSnippetID', $record->ID);
+            $record->delete();
+    
+            $this->response->addHeader('X-Status', rawurlencode(_t('CodeBank.SNIPPET_DELETED', '_Snippet has been deleted')));
+        } else {
+            $this->response->addHeader('X-Status', rawurlencode(_t('CodeBank.PERMISSION_DENIED', '_Permission Denied')));
+        }
+        
+        $this->redirect('admin/codeBank/');
+        return $this->getResponseNegotiator()->respond($this->request);
+    }
+}
diff --git a/code/control/CodeBankIPAgreement.php b/code/control/CodeBankIPAgreement.php
index 1401735..9256f37 100644
--- a/code/control/CodeBankIPAgreement.php
+++ b/code/control/CodeBankIPAgreement.php
@@ -1,132 +1,136 @@
-<?php
-class CodeBankIPAgreement extends CodeBank {
-    private static $url_segment='codeBank/agreement';
-    private static $url_rule='/$Action/$ID/$OtherID';
-    private static $url_priority=64;
-    private static $session_namespace='CodeBankIPAgreement';
-    
-    private static $required_permission_codes=array(
-                                                    'CODE_BANK_ACCESS'
-                                                );
-    
-    private static $allowed_actions=array(
-                                        'EditForm'
-                                    );
-    
-    
-    /**
-     * Initializes the code bank admin
-     */
-    public function init() {
-        LeftAndMain::init();
-    
-        Requirements::css(CB_DIR.'/css/CodeBank.css');
-        Requirements::customScript("var CB_DIR='".CB_DIR."';", 'cb_dir');
-        
-        if(empty(CodeBankConfig::CurrentConfig()->IPMessage) || Session::get('CodeBankIPAgreed')===true) {
-            $this->redirect('admin/codeBank');
-        }
-    }
-    
-    /**
-     * Gets the form used for agreeing or disagreeing to the ip agreement
-     * @param {int} $id ID of the record to fetch
-     * @param {FieldList} $fields Fields to use
-     * @return {Form} Form to be used
-     */
-    public function getEditForm($id=null, $fields=null) {
-        $defaultPanel=Config::inst()->get('AdminRootController', 'default_panel');
-        if($defaultPanel=='CodeBank') {
-            $defaultPanel='SecurityAdmin';
-            $sng=singleton($defaultPanel);
-        }
-        
-        
-        $fields=new FieldList(
-                            new TabSet('Root',
-                                            new Tab('Main',
-                                                        new HeaderField('IPMessageTitle', _t('CodeBank.IP_MESSAGE_TITLE', '_You must agree to the following terms before using Code Bank'), 2),
-                                                        new LiteralField('IPMessage', '<div class="ipMessage"><div class="middleColumn">'.CodeBankConfig::CurrentConfig()->dbObject('IPMessage')->forTemplate().'</div></div>'),
-                                                        new HiddenField('RedirectLink', 'RedirectLink', $sng->Link())
-                                                    )
-                                        )
-                        );
-        
-        
-        if(Session::get('CodeBankIPAgreed')===true) {
-            $fields->addFieldToTab('Root.Main', new HiddenField('AgreementAgreed', 'AgreementAgreed', Session::get('CodeBankIPAgreed')));
-        }
-        
-        
-        $actions=new FieldList(
-                                FormAction::create('doDisagree', _t('CodeBankIPAgreement.DISAGREE', '_Disagree'))->addExtraClass('ss-ui-action-destructive'),
-                                FormAction::create('doAgree', _t('CodeBankIPAgreement.AGREE', '_Agree'))->addExtraClass('ss-ui-action-constructive')
-                            );
-        
-        $form=CMSForm::create($this, 'EditForm', $fields, $actions)->setHTMLID('Form_EditForm');
-        $form->disableDefaultAction();
-        $form->addExtraClass('cms-edit-form');
-        $form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
-        $form->addExtraClass('center '.$this->BaseCSSClasses());
-        $form->setAttribute('data-pjax-fragment', 'CurrentForm');
-        
-        
-        //Display message telling user to run dev/build because the version numbers are out of sync
-        if(CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
-            $form->setMessage(_t('CodeBank.UPDATE_NEEDED', '_A database upgrade is required please run {startlink}dev/build{endlink}.', array('startlink'=>'<a href="dev/build?flush=all">', 'endlink'=>'</a>')), 'error');
-        }else if($this->hasOldTables()) {
-            $form->setMessage(_t('CodeBank.MIGRATION_AVAILABLE', '_It appears you are upgrading from Code Bank 2.2.x, your old data can be migrated {startlink}click here to begin{endlink}, though it is recommended you backup your database first.', array('startlink'=>'<a href="dev/tasks/CodeBankLegacyMigrate">', 'endlink'=>'</a>')), 'warning');
-        }
-        
-        
-        
-        $form->Actions()->push(new LiteralField('CodeBankVersion', '<p class="codeBankVersion">Code Bank: '.$this->getVersion().'</p>'));
-        
-        Requirements::javascript(CB_DIR.'/javascript/CodeBank.IPMessage.js');
-        
-        return $form;
-    }
-    
-    public function doAgree($data, Form $form) {
-        Session::set('CodeBankIPAgreed', true);
-        
-        return $this->getResponseNegotiator()->respond($this->request);
-    }
-    
-    /**
-     * @return ArrayList
-     */
-    public function Breadcrumbs($unlinked=false) {
-        $defaultTitle=LeftAndMain::menu_title_for_class('CodeBankIPAgreement');
-        $title=_t('CodeBankIPAgreement.MENUTITLE', $defaultTitle);
-        $items=new ArrayList(array(
-                                    new ArrayData(array(
-                                                        'Title'=>$title,
-                                                        'Link'=>($unlinked ? false:'admin/codeBank/show/'.$this->currentPageID())
-                                                    ))
-                                ));
-        
-        $record=$this->currentPage();
-        if($record && $record->exists()) {
-            if($record->hasExtension('Hierarchy')) {
-                $ancestors=$record->getAncestors();
-                $ancestors=new ArrayList(array_reverse($ancestors->toArray()));
-                $ancestors->push($record);
-                foreach($ancestors as $ancestor) {
-                    $items->push(new ArrayData(array(
-                                                    'Title'=>$ancestor->Title,
-                                                    'Link'=>($unlinked ? false:Controller::join_links($this->Link('show'), $ancestor->ID))
-                                                )));
-                }
-            }else {
-                $items->push(new ArrayData(array(
-                                                'Title'=>$record->Title,
-                                                'Link'=>($unlinked ? false:Controller::join_links($this->Link('show'), $record->ID))
-                                            )));
-            }
-        }
-
-        return $items;
-    }
-}
-?>
\ No newline at end of file
+<?php
+class CodeBankIPAgreement extends CodeBank
+{
+    private static $url_segment='codeBank/agreement';
+    private static $url_rule='/$Action/$ID/$OtherID';
+    private static $url_priority=64;
+    private static $session_namespace='CodeBankIPAgreement';
+    
+    private static $required_permission_codes=array(
+                                                    'CODE_BANK_ACCESS'
+                                                );
+    
+    private static $allowed_actions=array(
+                                        'EditForm'
+                                    );
+    
+    
+    /**
+     * Initializes the code bank admin
+     */
+    public function init()
+    {
+        LeftAndMain::init();
+    
+        Requirements::css(CB_DIR.'/css/CodeBank.css');
+        Requirements::customScript("var CB_DIR='".CB_DIR."';", 'cb_dir');
+        
+        if (empty(CodeBankConfig::CurrentConfig()->IPMessage) || Session::get('CodeBankIPAgreed')===true) {
+            $this->redirect('admin/codeBank');
+        }
+    }
+    
+    /**
+     * Gets the form used for agreeing or disagreeing to the ip agreement
+     * @param {int} $id ID of the record to fetch
+     * @param {FieldList} $fields Fields to use
+     * @return {Form} Form to be used
+     */
+    public function getEditForm($id=null, $fields=null)
+    {
+        $defaultPanel=Config::inst()->get('AdminRootController', 'default_panel');
+        if ($defaultPanel=='CodeBank') {
+            $defaultPanel='SecurityAdmin';
+            $sng=singleton($defaultPanel);
+        }
+        
+        
+        $fields=new FieldList(
+                            new TabSet('Root',
+                                            new Tab('Main',
+                                                        new HeaderField('IPMessageTitle', _t('CodeBank.IP_MESSAGE_TITLE', '_You must agree to the following terms before using Code Bank'), 2),
+                                                        new LiteralField('IPMessage', '<div class="ipMessage"><div class="middleColumn">'.CodeBankConfig::CurrentConfig()->dbObject('IPMessage')->forTemplate().'</div></div>'),
+                                                        new HiddenField('RedirectLink', 'RedirectLink', $sng->Link())
+                                                    )
+                                        )
+                        );
+        
+        
+        if (Session::get('CodeBankIPAgreed')===true) {
+            $fields->addFieldToTab('Root.Main', new HiddenField('AgreementAgreed', 'AgreementAgreed', Session::get('CodeBankIPAgreed')));
+        }
+        
+        
+        $actions=new FieldList(
+                                FormAction::create('doDisagree', _t('CodeBankIPAgreement.DISAGREE', '_Disagree'))->addExtraClass('ss-ui-action-destructive'),
+                                FormAction::create('doAgree', _t('CodeBankIPAgreement.AGREE', '_Agree'))->addExtraClass('ss-ui-action-constructive')
+                            );
+        
+        $form=CMSForm::create($this, 'EditForm', $fields, $actions)->setHTMLID('Form_EditForm');
+        $form->disableDefaultAction();
+        $form->addExtraClass('cms-edit-form');
+        $form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
+        $form->addExtraClass('center '.$this->BaseCSSClasses());
+        $form->setAttribute('data-pjax-fragment', 'CurrentForm');
+        
+        
+        //Display message telling user to run dev/build because the version numbers are out of sync
+        if (CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
+            $form->setMessage(_t('CodeBank.UPDATE_NEEDED', '_A database upgrade is required please run {startlink}dev/build{endlink}.', array('startlink'=>'<a href="dev/build?flush=all">', 'endlink'=>'</a>')), 'error');
+        } elseif ($this->hasOldTables()) {
+            $form->setMessage(_t('CodeBank.MIGRATION_AVAILABLE', '_It appears you are upgrading from Code Bank 2.2.x, your old data can be migrated {startlink}click here to begin{endlink}, though it is recommended you backup your database first.', array('startlink'=>'<a href="dev/tasks/CodeBankLegacyMigrate">', 'endlink'=>'</a>')), 'warning');
+        }
+        
+        
+        
+        $form->Actions()->push(new LiteralField('CodeBankVersion', '<p class="codeBankVersion">Code Bank: '.$this->getVersion().'</p>'));
+        
+        Requirements::javascript(CB_DIR.'/javascript/CodeBank.IPMessage.js');
+        
+        return $form;
+    }
+    
+    public function doAgree($data, Form $form)
+    {
+        Session::set('CodeBankIPAgreed', true);
+        
+        return $this->getResponseNegotiator()->respond($this->request);
+    }
+    
+    /**
+     * @return ArrayList
+     */
+    public function Breadcrumbs($unlinked=false)
+    {
+        $defaultTitle=LeftAndMain::menu_title_for_class('CodeBankIPAgreement');
+        $title=_t('CodeBankIPAgreement.MENUTITLE', $defaultTitle);
+        $items=new ArrayList(array(
+                                    new ArrayData(array(
+                                                        'Title'=>$title,
+                                                        'Link'=>($unlinked ? false:'admin/codeBank/show/'.$this->currentPageID())
+                                                    ))
+                                ));
+        
+        $record=$this->currentPage();
+        if ($record && $record->exists()) {
+            if ($record->hasExtension('Hierarchy')) {
+                $ancestors=$record->getAncestors();
+                $ancestors=new ArrayList(array_reverse($ancestors->toArray()));
+                $ancestors->push($record);
+                foreach ($ancestors as $ancestor) {
+                    $items->push(new ArrayData(array(
+                                                    'Title'=>$ancestor->Title,
+                                                    'Link'=>($unlinked ? false:Controller::join_links($this->Link('show'), $ancestor->ID))
+                                                )));
+                }
+            } else {
+                $items->push(new ArrayData(array(
+                                                'Title'=>$record->Title,
+                                                'Link'=>($unlinked ? false:Controller::join_links($this->Link('show'), $record->ID))
+                                            )));
+            }
+        }
+
+        return $items;
+    }
+}
diff --git a/code/control/CodeBankSettings.php b/code/control/CodeBankSettings.php
index 455e48d..ff14114 100644
--- a/code/control/CodeBankSettings.php
+++ b/code/control/CodeBankSettings.php
@@ -1,5 +1,6 @@
 <?php
-class CodeBankSettings extends CodeBank {
+class CodeBankSettings extends CodeBank
+{
     private static $url_segment='codeBank/settings';
     private static $url_rule='/$Action/$ID/$OtherID';
     private static $url_priority=63;
@@ -16,7 +17,8 @@ class CodeBankSettings extends CodeBank {
                                         'doImportData'
                                     );
     
-    public function init() {
+    public function init()
+    {
         parent::init();
         
         Requirements::css(CB_DIR.'/css/CodeBank.css');
@@ -29,10 +31,11 @@ public function init() {
      *
      * @see LeftAndMain::getResponseNegotiator()
      */
-    public function getResponseNegotiator() {
+    public function getResponseNegotiator()
+    {
         $neg=parent::getResponseNegotiator();
         $controller=$this;
-        $neg->setCallback('CurrentForm', function() use(&$controller) {
+        $neg->setCallback('CurrentForm', function () use (&$controller) {
                                                                         return $controller->renderWith($controller->getTemplatesWithSuffix('_Content'));
                                                                     });
         
@@ -42,7 +45,8 @@ public function getResponseNegotiator() {
     /**
      * @return Form
      */
-    public function getEditForm($id = null, $fields = null) {
+    public function getEditForm($id = null, $fields = null)
+    {
         $config=CodeBankConfig::CurrentConfig();
         $fields=$config->getCMSFields();
         $actions=new FieldList(
@@ -51,7 +55,7 @@ public function getEditForm($id = null, $fields = null) {
                             );
         
         
-        if(Permission::check('ADMIN')) {
+        if (Permission::check('ADMIN')) {
             $actions->push(FormAction::create('doImportFromClient', _t('CodeBank.IMPORT_FROM_CLIENT', '_Import From Desktop Client'))->setAttribute('data-icon', 'import')->setAttribute('data-importurl', $this->Link('import-from-client')));
         }
         
@@ -59,22 +63,26 @@ public function getEditForm($id = null, $fields = null) {
         $form->addExtraClass('root-form');
         $form->addExtraClass('cms-edit-form center');
         // don't add data-pjax-fragment=CurrentForm, its added in the content template instead
-        
+
         $form->setHTMLID('Form_EditForm');
         $form->loadDataFrom($config);
         $form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
         
         // Use <button> to allow full jQuery UI styling
         $actions = $actions->dataFields();
-        if($actions) foreach($actions as $action) $action->setUseButtonTag(true);
+        if ($actions) {
+            foreach ($actions as $action) {
+                $action->setUseButtonTag(true);
+            }
+        }
         
         $this->extend('updateEditForm', $form);
         
         
         //Display message telling user to run dev/build because the version numbers are out of sync
-        if(CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
+        if (CB_VERSION!='@@VERSION@@' && CodeBankConfig::CurrentConfig()->Version!=CB_VERSION.' '.CB_BUILD_DATE) {
             $form->setMessage(_t('CodeBank.UPDATE_NEEDED', '_A database upgrade is required please run {startlink}dev/build{endlink}.', array('startlink'=>'<a href="dev/build?flush=all">', 'endlink'=>'</a>')), 'error');
-        }else if($this->hasOldTables()) {
+        } elseif ($this->hasOldTables()) {
             $form->setMessage(_t('CodeBank.MIGRATION_AVAILABLE', '_It appears you are upgrading from Code Bank 2.2.x, your old data can be migrated {startlink}click here to begin{endlink}, though it is recommended you backup your database first.', array('startlink'=>'<a href="dev/tasks/CodeBankLegacyMigrate">', 'endlink'=>'</a>')), 'warning');
         }
         
@@ -91,7 +99,8 @@ public function getEditForm($id = null, $fields = null) {
      * @param {Form} $form Submitting form
      * @return {SS_HTTPResponse} Response
      */
-    public function doSave($data, $form) {
+    public function doSave($data, $form)
+    {
         $config=CodeBankConfig::CurrentConfig();
         $form->saveInto($config);
         $config->write();
@@ -104,14 +113,15 @@ public function doSave($data, $form) {
      * Handles requests for the import from client popup
      * @return {string} Rendered template
      */
-    public function import_from_client() {
-        if(!Permission::check('ADMIN')) {
+    public function import_from_client()
+    {
+        if (!Permission::check('ADMIN')) {
             Security::permissionFailure($this);
             return;
         }
         
         $form=$this->ImportFromClientForm();
-        if(Session::get('reloadOnImportDialogClose')) {
+        if (Session::get('reloadOnImportDialogClose')) {
             Requirements::javascript(CB_DIR.'/javascript/CodeBank.ImportDialog.js');
             Session::clear('reloadOnImportDialogClose');
         }
@@ -126,8 +136,9 @@ public function import_from_client() {
      * Form used for importing data from the client
      * @return {Form} Form to be used in the popup
      */
-    public function ImportFromClientForm() {
-        if(!Permission::check('ADMIN')) {
+    public function ImportFromClientForm()
+    {
+        if (!Permission::check('ADMIN')) {
             Security::permissionFailure($this);
             return;
         }
@@ -169,15 +180,16 @@ public function ImportFromClientForm() {
      * @param {Form} $form Submitting form
      * @return {SS_HTTPResponse} Response
      */
-    public function doImportData($data, Form $form) {
-        if(!Permission::check('ADMIN')) {
+    public function doImportData($data, Form $form)
+    {
+        if (!Permission::check('ADMIN')) {
             Security::permissionFailure($this);
             return;
         }
         
         $fileData=$form->Fields()->dataFieldByName('ImportFile')->Value();
         //Check that the file uploaded
-        if(!array_key_exists('tmp_name', $fileData) || !file_exists($fileData['tmp_name'])) {
+        if (!array_key_exists('tmp_name', $fileData) || !file_exists($fileData['tmp_name'])) {
             $form->sessionMessage(_t('CodeBank.IMPORT_READ_ERROR', '_Could not read the file to be imported'), 'bad');
             return $this->redirectBack();
         }
@@ -185,7 +197,7 @@ public function doImportData($data, Form $form) {
         
         //Load the file into memory
         $fileData=file_get_contents($fileData['tmp_name']);
-        if($fileData===false || empty($fileData)) {
+        if ($fileData===false || empty($fileData)) {
             $form->sessionMessage(_t('CodeBank.IMPORT_READ_ERROR', '_Could not read the file to be imported'), 'bad');
             return $this->redirectBack();
         }
@@ -193,14 +205,14 @@ public function doImportData($data, Form $form) {
         
         //Decode the json
         $fileData=json_decode($fileData);
-        if($fileData===false || !is_object($fileData)) {
+        if ($fileData===false || !is_object($fileData)) {
             $form->sessionMessage(_t('CodeBank.IMPORT_READ_ERROR', '_Could not read the file to be imported'), 'bad');
             return $this->redirectBack();
         }
         
         
         //Verify the format is ToServer
-        if($fileData->format!='ToServer') {
+        if ($fileData->format!='ToServer') {
             $form->sessionMessage(_t('CodeBank.IMPORT_FILE_FORMAT_INCORRECT', '_Import file format is incorrect'), 'bad');
             return $this->redirectBack();
         }
@@ -211,19 +223,19 @@ public function doImportData($data, Form $form) {
         
         
         //Start transaction if supported
-        if(DB::getConn()->supportsTransactions()) {
+        if (DB::getConn()->supportsTransactions()) {
             DB::getConn()->transactionStart();
         }
         
         
         //If not appending empty the tables
-        if(!isset($data['AppendData'])) {
+        if (!isset($data['AppendData'])) {
             DB::query('DELETE FROM Snippet');
             DB::query('DELETE FROM SnippetVersion');
             DB::query('DELETE FROM SnippetLanguage');
             DB::query('DELETE FROM SnippetPackage');
             DB::query('DELETE FROM SnippetFolder');
-        }else {
+        } else {
             $langMap=array();
             $pkgMap=array();
             $folderMap=array();
@@ -232,12 +244,12 @@ public function doImportData($data, Form $form) {
         
         
         //Import Languages
-        foreach($fileData->data->languages as $lang) {
-            if(isset($data['AppendData'])) {
+        foreach ($fileData->data->languages as $lang) {
+            if (isset($data['AppendData'])) {
                 $dbLang=SnippetLanguage::get()->filter('Name:ExactMatch:nocase', Convert::raw2sql($lang->language))->first();
-                if(!empty($dbLang) && $dbLang!==false && $dbLang->ID>0) {
+                if (!empty($dbLang) && $dbLang!==false && $dbLang->ID>0) {
                     $langMap['lang-'.$lang->id]=$dbLang->ID;
-                }else {
+                } else {
                     $newLang=new SnippetLanguage();
                     $newLang->Name=$lang->language;
                     $newLang->FileExtension=$lang->file_extension;
@@ -248,7 +260,7 @@ public function doImportData($data, Form $form) {
                     $langMap['lang-'.$lang->id]=$newLang->ID;
                     unset($newLang);
                 }
-            }else {
+            } else {
                 DB::query('INSERT INTO "SnippetLanguage" ("ID", "ClassName", "Created", "LastEdited", "Name", "FileExtension", "HighlightCode", "UserLanguage") '.
                         "VALUES(".intval($lang->id).",'SnippetLanguage', '".date('Y-m-d H:i:s')."','".date('Y-m-d H:i:s')."','".Convert::raw2sql($lang->language)."','".Convert::raw2sql($lang->file_extension)."','".Convert::raw2sql($lang->shjs_code)."',".intval($lang->user_language).")");
             }
@@ -256,15 +268,15 @@ public function doImportData($data, Form $form) {
         
         
         //Import Packages
-        foreach($fileData->data->packages as $pkg) {
-            if(isset($data['AppendData'])) {
+        foreach ($fileData->data->packages as $pkg) {
+            if (isset($data['AppendData'])) {
                 $newPkg=new SnippetPackage();
                 $newPkg->Title=$pkg->title;
                 $newPkg->write();
                 
                 $pkgMap['pkg-'.$pkg->id]=$newPkg->ID;
                 unset($newPkg);
-            }else {
+            } else {
                 DB::query('INSERT INTO "SnippetPackage" ("ID", "ClassName", "Created", "LastEdited", "Title") '.
                         "VALUES(".intval($pkg->id).",'SnippetPackage', '".date('Y-m-d H:i:s')."','".date('Y-m-d H:i:s')."','".Convert::raw2sql($pkg->title)."')");
             }
@@ -272,10 +284,10 @@ public function doImportData($data, Form $form) {
         
         
         //Import Folders
-        foreach($fileData->data->folders as $folder) {
-            if(isset($data['AppendData'])) {
-                if(!isset($langMap['lang-'.$folder->fkLanguageId])) {
-                    if(DB::getConn()->supportsTransactions()) {
+        foreach ($fileData->data->folders as $folder) {
+            if (isset($data['AppendData'])) {
+                if (!isset($langMap['lang-'.$folder->fkLanguageId])) {
+                    if (DB::getConn()->supportsTransactions()) {
                         DB::getConn()->transactionRollback();
                     }
                     
@@ -291,7 +303,7 @@ public function doImportData($data, Form $form) {
                 
                 $folderMap['fld-'.$folder->id]=$newFld->ID;
                 unset($newFld);
-            }else {
+            } else {
                 DB::query('INSERT INTO "SnippetFolder" ("ID", "ClassName", "Created", "LastEdited", "Name", "ParentID", "LanguageID") '.
                         "VALUES(".intval($folder->id).",'SnippetFolder', '".date('Y-m-d H:i:s')."','".date('Y-m-d H:i:s')."','".Convert::raw2sql($folder->name)."', ".intval($folder->fkParentId).", ".intval($folder->fkLanguageId).")");
             }
@@ -299,10 +311,10 @@ public function doImportData($data, Form $form) {
         
         
         //Import Snippets
-        foreach($fileData->data->snippets as $snip) {
-            if(isset($data['AppendData'])) {
-                if(!isset($langMap['lang-'.$snip->fkLanguage])) {
-                    if(DB::getConn()->supportsTransactions()) {
+        foreach ($fileData->data->snippets as $snip) {
+            if (isset($data['AppendData'])) {
+                if (!isset($langMap['lang-'.$snip->fkLanguage])) {
+                    if (DB::getConn()->supportsTransactions()) {
                         DB::getConn()->transactionRollback();
                     }
                     
@@ -323,7 +335,7 @@ public function doImportData($data, Form $form) {
                 
                 $snipMap['snip-'.$snip->id]=$newSnip->ID;
                 unset($newSnip);
-            }else {
+            } else {
                 DB::query('INSERT INTO "Snippet" ("ID", "ClassName", "Created", "LastEdited", "Title", "Description", "Tags", "LanguageID", "CreatorID", "LastEditorID", "PackageID", "FolderID") '.
                         "VALUES(".intval($snip->id).",'Snippet', '".date('Y-m-d H:i:s')."','".date('Y-m-d H:i:s')."','".Convert::raw2sql($snip->title)."', '".Convert::raw2sql($snip->description)."', '".Convert::raw2sql($snip->tags)."', ".intval($snip->fkLanguage).", ".Member::currentUserID().", ".Member::currentUserID().", ".intval($snip->fkPackageID).", ".intval($snip->fkFolderID).")");
             }
@@ -331,10 +343,10 @@ public function doImportData($data, Form $form) {
         
         
         //Import Snippet Versions
-        foreach($fileData->data->versions as $ver) {
-            if(isset($data['AppendData'])) {
-                if(!isset($snipMap['snip-'.$ver->fkSnippit])) {
-                    if(DB::getConn()->supportsTransactions()) {
+        foreach ($fileData->data->versions as $ver) {
+            if (isset($data['AppendData'])) {
+                if (!isset($snipMap['snip-'.$ver->fkSnippit])) {
+                    if (DB::getConn()->supportsTransactions()) {
                         DB::getConn()->transactionRollback();
                     }
                 
@@ -344,7 +356,7 @@ public function doImportData($data, Form $form) {
                 
                 DB::query('INSERT INTO "SnippetVersion" ("ClassName", "Created", "LastEdited", "Text", "ParentID") '.
                         "VALUES('SnippetVersion', '".Convert::raw2sql($ver->date)."','".Convert::raw2sql($ver->date)."','".Convert::raw2sql($ver->text)."', ".intval($snipMap['snip-'.$ver->fkSnippit]).")");
-            }else {
+            } else {
                 DB::query('INSERT INTO "SnippetVersion" ("ID", "ClassName", "Created", "LastEdited", "Text", "ParentID") '.
                         "VALUES(".intval($ver->id).",'SnippetVersion', '".Convert::raw2sql($ver->date)."','".Convert::raw2sql($ver->date)."','".Convert::raw2sql($ver->text)."', ".intval($ver->fkSnippit).")");
             }
@@ -352,7 +364,7 @@ public function doImportData($data, Form $form) {
         
         
         //End transaction if supported
-        if(DB::getConn()->supportsTransactions()) {
+        if (DB::getConn()->supportsTransactions()) {
             DB::getConn()->transactionEnd();
         }
         
@@ -366,7 +378,8 @@ public function doImportData($data, Form $form) {
     /**
      * @return ArrayList
      */
-    public function Breadcrumbs($unlinked=false) {
+    public function Breadcrumbs($unlinked=false)
+    {
         $defaultTitle=self::menu_title_for_class(get_class($this));
         return new ArrayList(array(
                                     new ArrayData(array(
@@ -376,4 +389,3 @@ public function Breadcrumbs($unlinked=false) {
                                 ));
     }
 }
-?>
diff --git a/code/extensions/CodeBankMember.php b/code/extensions/CodeBankMember.php
index 36b0b42..a28d82c 100644
--- a/code/extensions/CodeBankMember.php
+++ b/code/extensions/CodeBankMember.php
@@ -1,19 +1,20 @@
-<?php
-class CodeBankMember extends DataExtension {
-    private static $db=array(
-                            'UseHeartbeat'=>'Boolean'
-                         );
-    
-    private static $defaults=array(
-                                    'UseHeartbeat'=>false
-                                );
-    
-    /**
-     * Updates the CMS fields adding the fields defined in this extension
-     * @param {FieldList} $fields Field List that new fields will be added to
-     */
-    public function updateCMSFields(FieldList $fields) {
-        $fields->addFieldToTab('Root.Main', new CheckboxField('UseHeartbeat', _t('CodeBankMember.USE_HEARTBEAT', '_Use Code Bank Heartbeat to keep client session alive?')));
-    }
-}
-?>
\ No newline at end of file
+<?php
+class CodeBankMember extends DataExtension
+{
+    private static $db=array(
+                            'UseHeartbeat'=>'Boolean'
+                         );
+    
+    private static $defaults=array(
+                                    'UseHeartbeat'=>false
+                                );
+    
+    /**
+     * Updates the CMS fields adding the fields defined in this extension
+     * @param {FieldList} $fields Field List that new fields will be added to
+     */
+    public function updateCMSFields(FieldList $fields)
+    {
+        $fields->addFieldToTab('Root.Main', new CheckboxField('UseHeartbeat', _t('CodeBankMember.USE_HEARTBEAT', '_Use Code Bank Heartbeat to keep client session alive?')));
+    }
+}
diff --git a/code/extensions/CodeBankSecurity.php b/code/extensions/CodeBankSecurity.php
index 259b018..96a950d 100644
--- a/code/extensions/CodeBankSecurity.php
+++ b/code/extensions/CodeBankSecurity.php
@@ -1,11 +1,12 @@
-<?php
-class CodeBankSecurity extends Extension {
-    /**
-     * Gets the current version of Code Bank
-     * @return {string} Version Number Plus Build Date
-     */
-    final public function getCodeBankVersion() {
-        return singleton('CodeBank')->getVersion();
-    }
-}
-?>
\ No newline at end of file
+<?php
+class CodeBankSecurity extends Extension
+{
+    /**
+     * Gets the current version of Code Bank
+     * @return {string} Version Number Plus Build Date
+     */
+    final public function getCodeBankVersion()
+    {
+        return singleton('CodeBank')->getVersion();
+    }
+}
diff --git a/code/extensions/SnippetHierarchy.php b/code/extensions/SnippetHierarchy.php
index 6d33187..71b91af 100644
--- a/code/extensions/SnippetHierarchy.php
+++ b/code/extensions/SnippetHierarchy.php
@@ -1,5 +1,6 @@
 <?php
-class SnippetHierarchy extends DataExtension {
+class SnippetHierarchy extends DataExtension
+{
     protected $markedNodes;
     
     protected $markingFilter;
@@ -31,14 +32,21 @@ class SnippetHierarchy extends DataExtension {
     /**
      * Validate the owner object - check for existence of infinite loops.
      */
-    public function validate(ValidationResult $validationResult) {
-        if (!$this->owner->ID) return; // The object is new, won't be looping.
-        if (!$this->owner->LanguageID) return; // The object has no parent, won't be looping.
-        if (!$this->owner->isChanged('LanguageID')) return; // The parent has not changed, skip the check for performance reasons.
+    public function validate(ValidationResult $validationResult)
+    {
+        if (!$this->owner->ID) {
+            return;
+        } // The object is new, won't be looping.
+        if (!$this->owner->LanguageID) {
+            return;
+        } // The object has no parent, won't be looping.
+        if (!$this->owner->isChanged('LanguageID')) {
+            return;
+        } // The parent has not changed, skip the check for performance reasons.
 
         // Walk the hierarchy upwards until we reach the top, or until we reach the originating node again.
         $node=$this->owner;
-        while($node) {
+        while ($node) {
             if ($node->LanguageID==$this->owner->ID) {
                 // Hierarchy is looping.
                 $validationResult->error(
@@ -62,17 +70,18 @@ public function validate(ValidationResult $validationResult) {
      * Return an array of this page and its ancestors, ordered item -> root.
      * @return array
      */
-    public function parentStack() {
+    public function parentStack()
+    {
         $p=$this->owner;
         
-        while($p) {
+        while ($p) {
             $stack[]=$p;
-            if($p->FolderID && $p->FolderID>0) {
+            if ($p->FolderID && $p->FolderID>0) {
                 $folder=$p->Folder();
-                if(!empty($folder) && $folder!==false && $folder->ID!=0) {
+                if (!empty($folder) && $folder!==false && $folder->ID!=0) {
                     $p=$folder;
                 }
-            }else {
+            } else {
                 $p=$p->LanguageID ? $p->Language() : null;
             }
         }
@@ -84,7 +93,8 @@ public function parentStack() {
      * Get the parent of this class.
      * @return DataObject
      */
-    public function getParent($filter='') {
+    public function getParent($filter='')
+    {
         return $this->owner->Language();
     }
     
@@ -93,11 +103,12 @@ public function getParent($filter='') {
      *
      * @return SS_List
      */
-    public function getAncestors() {
+    public function getAncestors()
+    {
         $ancestors=new ArrayList();
         $object   =$this->owner;
         
-        while($object=$object->Language()) {
+        while ($object=$object->Language()) {
             $ancestors->push($object);
         }
         
@@ -112,11 +123,12 @@ public function getAncestors() {
      * @param DataObject afterNode Used for recursive calls to this function
      * @return DataObject
      */
-    public function naturalNext( $className=null, $root=0, $afterNode=null ) {
+    public function naturalNext($className=null, $root=0, $afterNode=null)
+    {
         // If this node is not the node we are searching from, then we can possibly return this
         // node as a solution
-        if($afterNode && $afterNode->ID != $this->owner->ID) {
-            if(!$className || ($className && $this->owner->class == $className)) {
+        if ($afterNode && $afterNode->ID != $this->owner->ID) {
+            if (!$className || ($className && $this->owner->class == $className)) {
                 return $this->owner;
             }
         }
@@ -124,27 +136,27 @@ public function naturalNext( $className=null, $root=0, $afterNode=null ) {
         $nextNode=null;
         $baseClass=ClassInfo::baseDataClass($this->owner->class);
         
-        $children=DataObject::get(ClassInfo::baseDataClass($this->owner->class), "\"$baseClass\".\"LanguageID\"={$this->owner->ID}" . ( ( $afterNode ) ? " AND \"Sort\" > " . sprintf( '%d', $afterNode->Sort ) : "" ), '"Sort" ASC');
+        $children=DataObject::get(ClassInfo::baseDataClass($this->owner->class), "\"$baseClass\".\"LanguageID\"={$this->owner->ID}" . (($afterNode) ? " AND \"Sort\" > " . sprintf('%d', $afterNode->Sort) : ""), '"Sort" ASC');
         
         // Try all the siblings of this node after the given node
         /*if( $siblings=DataObject::get( ClassInfo::baseDataClass($this->owner->class), "\"LanguageID\"={$this->owner->LanguageID}" . ( $afterNode ) ? "\"Sort\" > {$afterNode->Sort}" : "" , '\"Sort\" ASC' ) )
             $searchNodes->merge( $siblings );*/
         
-        if($children) {
-            foreach($children as $node) {
-                if($nextNode=$node->naturalNext($className, $node->ID, $this->owner)) {
+        if ($children) {
+            foreach ($children as $node) {
+                if ($nextNode=$node->naturalNext($className, $node->ID, $this->owner)) {
                     break;
                 }
             }
             
-            if($nextNode) {
+            if ($nextNode) {
                 return $nextNode;
             }
         }
         
         // if this is not an instance of the root class or has the root id, search the parent
-        if(!(is_numeric($root) && $root == $this->owner->ID || $root == $this->owner->class) && ($parent=$this->owner->Language())) {
-            return $parent->naturalNext( $className, $root, $this->owner );
+        if (!(is_numeric($root) && $root == $this->owner->ID || $root == $this->owner->class) && ($parent=$this->owner->Language())) {
+            return $parent->naturalNext($className, $root, $this->owner);
         }
         
         return null;
@@ -161,16 +173,19 @@ public function naturalNext( $className=null, $root=0, $afterNode=null ) {
      * @param int $minNodeCount The minimum amount of nodes to mark.
      * @return int The actual number of nodes marked.
      */
-    public function markPartialTree($minNodeCount=30, $context=null, $childrenMethod="AllChildrenIncludingDeleted", $numChildrenMethod="numChildren") {
-        if(!is_numeric($minNodeCount)) $minNodeCount=30;
+    public function markPartialTree($minNodeCount=30, $context=null, $childrenMethod="AllChildrenIncludingDeleted", $numChildrenMethod="numChildren")
+    {
+        if (!is_numeric($minNodeCount)) {
+            $minNodeCount=30;
+        }
 
         $this->markedNodes=array($this->owner->ClassName.'_'.$this->owner->ID=>$this->owner);
         $this->owner->markUnexpanded();
 
         // foreach can't handle an ever-growing $nodes list
-        while(list($id, $node)=each($this->markedNodes)) {
+        while (list($id, $node)=each($this->markedNodes)) {
             $this->markChildren($node, $context, $childrenMethod, $numChildrenMethod);
-            if($minNodeCount && sizeof($this->markedNodes)>=$minNodeCount) {
+            if ($minNodeCount && sizeof($this->markedNodes)>=$minNodeCount) {
                 break;
             }
         }
@@ -182,20 +197,21 @@ public function markPartialTree($minNodeCount=30, $context=null, $childrenMethod
      * Mark all children of the given node that match the marking filter.
      * @param DataObject $node Parent node.
      */
-    public function markChildren($node, $context=null, $childrenMethod='AllChildrenIncludingDeleted', $numChildrenMethod='numChildren') {
-        if($node->hasMethod($childrenMethod)) {
+    public function markChildren($node, $context=null, $childrenMethod='AllChildrenIncludingDeleted', $numChildrenMethod='numChildren')
+    {
+        if ($node->hasMethod($childrenMethod)) {
             $children=$node->$childrenMethod($context);
-        }else {
+        } else {
             user_error(sprintf("Can't find the method '%s' on class '%s' for getting tree children", $childrenMethod, get_class($node)), E_USER_ERROR);
         }
         
         $node->markExpanded();
-        if($children) {
-            foreach($children as $child) {
-                if(!$this->markingFilter || $this->markingFilterMatches($child)) {
-                    if($child->$numChildrenMethod()) {
+        if ($children) {
+            foreach ($children as $child) {
+                if (!$this->markingFilter || $this->markingFilterMatches($child)) {
+                    if ($child->$numChildrenMethod()) {
                         $child->markUnexpanded();
-                    }else {
+                    } else {
                         $child->markExpanded();
                     }
                     
@@ -210,10 +226,11 @@ public function markChildren($node, $context=null, $childrenMethod='AllChildrenI
      * @param int $id ID of parent node.
      * @param boolean $open If this is true, mark the parent node as opened.
      */
-    public function markById($id, $open=false, $className=null) {
-        if(isset($this->markedNodes[$className.'_'.$id])) {
+    public function markById($id, $open=false, $className=null)
+    {
+        if (isset($this->markedNodes[$className.'_'.$id])) {
             $this->markChildren($this->markedNodes[$className.'_'.$id]);
-            if($open) {
+            if ($open) {
                 $this->markedNodes[$className.'_'.$id]->markOpened();
             }
             
@@ -227,10 +244,11 @@ public function markById($id, $open=false, $className=null) {
      * Expose the given object in the tree, by marking this page and all it ancestors.
      * @param DataObject $childObj
      */
-    public function markToExpose($childObj) {
-        if(is_object($childObj)){
+    public function markToExpose($childObj)
+    {
+        if (is_object($childObj)) {
             $stack=array_reverse($childObj->parentStack());
-            foreach($stack as $stackItem) {
+            foreach ($stack as $stackItem) {
                 $this->markById($stackItem->ID, true, $stackItem->ClassName);
             }
         }
@@ -244,14 +262,15 @@ public function markToExpose($childObj) {
      * @param Boolean $cache
      * @return int
      */
-    public function numChildren($cache=true) {
+    public function numChildren($cache=true)
+    {
         // Build the cache for this class if it doesn't exist.
-        if(!$cache || !is_numeric($this->_cache_numChildren)) {
-            if($this->owner instanceof SnippetLanguage) {
+        if (!$cache || !is_numeric($this->_cache_numChildren)) {
+            if ($this->owner instanceof SnippetLanguage) {
                 $this->_cache_numChildren=(int)$this->owner->Snippets()->filter('FolderID', 0)->Count() + (int)$this->owner->Folders()->Count();
-            }else if($this->owner instanceof SnippetFolder) {
+            } elseif ($this->owner instanceof SnippetFolder) {
                 $this->_cache_numChildren=(int)$this->owner->Snippets()->Count() + (int)$this->owner->Folders()->Count();
-            }else {
+            } else {
                 $this->_cache_numChildren=0;
             }
         }
@@ -272,27 +291,28 @@ public function numChildren($cache=true) {
      * @param int $minNodeCount
      * @return string
      */
-    public function getChildrenAsUL($attributes="", $titleEval='"<li>" . $child->Title', $extraArg=null, $limitToMarked=false, $childrenMethod="AllChildrenIncludingDeleted", $numChildrenMethod="numChildren", $rootCall=true, $minNodeCount=30) {
-        if($limitToMarked && $rootCall) {
+    public function getChildrenAsUL($attributes="", $titleEval='"<li>" . $child->Title', $extraArg=null, $limitToMarked=false, $childrenMethod="AllChildrenIncludingDeleted", $numChildrenMethod="numChildren", $rootCall=true, $minNodeCount=30)
+    {
+        if ($limitToMarked && $rootCall) {
             $this->markingFinished($numChildrenMethod);
         }
     
-        if($this->owner->hasMethod($childrenMethod)) {
+        if ($this->owner->hasMethod($childrenMethod)) {
             $children=$this->owner->$childrenMethod($extraArg);
         } else {
             user_error(sprintf("Can't find the method '%s' on class '%s' for getting tree children",
                     $childrenMethod, get_class($this->owner)), E_USER_ERROR);
         }
     
-        if($children) {
-            if($attributes) {
+        if ($children) {
+            if ($attributes) {
                 $attributes=" $attributes";
             }
                 
             $output="<ul$attributes>\n";
     
-            foreach($children as $child) {
-                if(!$limitToMarked || $child->isMarked()) {
+            foreach ($children as $child) {
+                if (!$limitToMarked || $child->isMarked()) {
                     $foundAChild=true;
                     $output .= (is_callable($titleEval)) ? $titleEval($child) : eval("return $titleEval;");
                     $output .= "\n" .
@@ -303,7 +323,7 @@ public function getChildrenAsUL($attributes="", $titleEval='"<li>" . $child->Tit
             $output .= "</ul>\n";
         }
     
-        if(isset($foundAChild) && $foundAChild) {
+        if (isset($foundAChild) && $foundAChild) {
             return $output;
         }
     }
@@ -313,7 +333,8 @@ public function getChildrenAsUL($attributes="", $titleEval='"<li>" . $child->Tit
      * @param string $parameterName The parameter on each node to check when marking.
      * @param mixed $parameterValue The value the parameter must be to be marked.
      */
-    public function setMarkingFilter($parameterName, $parameterValue) {
+    public function setMarkingFilter($parameterName, $parameterValue)
+    {
         $this->markingFilter=array(
                 "parameter" => $parameterName,
                 "value" => $parameterValue
@@ -325,7 +346,8 @@ public function setMarkingFilter($parameterName, $parameterValue) {
      * The node in question will be passed to the function.
      * @param string $funcName The function name.
      */
-    public function setMarkingFilterFunction($funcName) {
+    public function setMarkingFilterFunction($funcName)
+    {
         $this->markingFilter=array(
                 "func" => $funcName,
         );
@@ -336,17 +358,18 @@ public function setMarkingFilterFunction($funcName) {
      * @param DataObject $node Node to check.
      * @return boolean
      */
-    public function markingFilterMatches($node) {
-        if(!$this->markingFilter) {
+    public function markingFilterMatches($node)
+    {
+        if (!$this->markingFilter) {
             return true;
         }
     
-        if(isset($this->markingFilter['parameter']) && $parameterName=$this->markingFilter['parameter']) {
-            if(is_array($this->markingFilter['value'])){
+        if (isset($this->markingFilter['parameter']) && $parameterName=$this->markingFilter['parameter']) {
+            if (is_array($this->markingFilter['value'])) {
                 $ret=false;
-                foreach($this->markingFilter['value'] as $value) {
+                foreach ($this->markingFilter['value'] as $value) {
                     $ret=$ret||$node->$parameterName==$value;
-                    if($ret == true) {
+                    if ($ret == true) {
                         break;
                     }
                 }
@@ -354,7 +377,7 @@ public function markingFilterMatches($node) {
             } else {
                 return ($node->$parameterName == $this->markingFilter['value']);
             }
-        } else if ($func=$this->markingFilter['func']) {
+        } elseif ($func=$this->markingFilter['func']) {
             return call_user_func($func, $node);
         }
     }
@@ -363,11 +386,12 @@ public function markingFilterMatches($node) {
      * Ensure marked nodes that have children are also marked expanded.
      * Call this after marking but before iterating over the tree.
      */
-    protected function markingFinished($numChildrenMethod="numChildren") {
+    protected function markingFinished($numChildrenMethod="numChildren")
+    {
         // Mark childless nodes as expanded.
-        if($this->markedNodes) {
-            foreach($this->markedNodes as $id => $node) {
-                if(!$node->isExpanded() && !$node->$numChildrenMethod()) {
+        if ($this->markedNodes) {
+            foreach ($this->markedNodes as $id => $node) {
+                if (!$node->isExpanded() && !$node->$numChildrenMethod()) {
                     $node->markExpanded();
                 }
             }
@@ -378,13 +402,16 @@ protected function markingFinished($numChildrenMethod="numChildren") {
      * Return CSS classes of 'unexpanded', 'closed', both, or neither, depending on
      * the marking of this DataObject.
      */
-    public function markingClasses() {
+    public function markingClasses()
+    {
         $classes='';
-        if(!$this->isExpanded()) {
+        if (!$this->isExpanded()) {
             $classes .= " unexpanded jstree-closed";
         }
-        if($this->isTreeOpened()) {
-            if($this->numChildren() > 0) $classes .= " jstree-open";
+        if ($this->isTreeOpened()) {
+            if ($this->numChildren() > 0) {
+                $classes .= " jstree-open";
+            }
         } else {
             $classes .= " closed";
         }
@@ -394,14 +421,16 @@ public function markingClasses() {
     /**
      * Return the IDs of all the marked nodes
      */
-    public function markedNodeIDs() {
+    public function markedNodeIDs()
+    {
         return array_keys($this->markedNodes);
     }
     
     /**
      * Mark this DataObject as expanded.
      */
-    public function markExpanded() {
+    public function markExpanded()
+    {
         self::$marked[ClassInfo::baseDataClass($this->owner->class)][$this->owner->ID]=true;
         self::$expanded[ClassInfo::baseDataClass($this->owner->class)][$this->owner->ID]=true;
     }
@@ -409,7 +438,8 @@ public function markExpanded() {
     /**
      * Mark this DataObject as unexpanded.
      */
-    public function markUnexpanded() {
+    public function markUnexpanded()
+    {
         self::$marked[ClassInfo::baseDataClass($this->owner->class)][$this->owner->ID]=true;
         self::$expanded[ClassInfo::baseDataClass($this->owner->class)][$this->owner->ID]=false;
     }
@@ -417,7 +447,8 @@ public function markUnexpanded() {
     /**
      * Mark this DataObject's tree as opened.
      */
-    public function markOpened() {
+    public function markOpened()
+    {
         self::$marked[ClassInfo::baseDataClass($this->owner->class)][$this->owner->ID]=true;
         self::$treeOpened[ClassInfo::baseDataClass($this->owner->class)][$this->owner->ID]=true;
     }
@@ -426,7 +457,8 @@ public function markOpened() {
      * Check if this DataObject is marked.
      * @return boolean
      */
-    public function isMarked() {
+    public function isMarked()
+    {
         $baseClass=ClassInfo::baseDataClass($this->owner->class);
         $id=$this->owner->ID;
         return isset(self::$marked[$baseClass][$id]) ? self::$marked[$baseClass][$id] : false;
@@ -436,7 +468,8 @@ public function isMarked() {
      * Check if this DataObject is expanded.
      * @return boolean
      */
-    public function isExpanded() {
+    public function isExpanded()
+    {
         $baseClass=ClassInfo::baseDataClass($this->owner->class);
         $id=$this->owner->ID;
         return isset(self::$expanded[$baseClass][$id]) ? self::$expanded[$baseClass][$id] : false;
@@ -445,7 +478,8 @@ public function isExpanded() {
     /**
      * Check if this DataObject's tree is opened.
      */
-    public function isTreeOpened() {
+    public function isTreeOpened()
+    {
         $baseClass=ClassInfo::baseDataClass($this->owner->class);
         $id=$this->owner->ID;
         return isset(self::$treeOpened[$baseClass][$id]) ? self::$treeOpened[$baseClass][$id] : false;
@@ -454,13 +488,16 @@ public function isTreeOpened() {
     /**
      * Return a partial tree as an HTML UL.
      */
-    public function partialTreeAsUL($minCount=50) {
+    public function partialTreeAsUL($minCount=50)
+    {
         $children=$this->owner->AllChildren();
-        if($children) {
-            if($attributes) $attributes=" $attributes";
+        if ($children) {
+            if ($attributes) {
+                $attributes=" $attributes";
+            }
             $output="<ul$attributes>\n";
     
-            foreach($children as $child) {
+            foreach ($children as $child) {
                 $output .= eval("return $titleEval;") . "\n" .
                         $child->getChildrenAsUL("", $titleEval, $extraArg) . "</li>\n";
             }
@@ -473,7 +510,8 @@ public function partialTreeAsUL($minCount=50) {
      * Get a list of this DataObject's and all it's descendants IDs.
      * @return int
      */
-    public function getDescendantIDList() {
+    public function getDescendantIDList()
+    {
         $idList=array();
         $this->loadDescendantIDListInto($idList);
         return $idList;
@@ -483,10 +521,11 @@ public function getDescendantIDList() {
      * Get a list of this DataObject's and all it's descendants ID, and put it in $idList.
      * @var array $idList Array to put results in.
      */
-    public function loadDescendantIDListInto(&$idList) {
-        if($children=$this->AllChildren()) {
-            foreach($children as $child) {
-                if(in_array($child->ID, $idList)) {
+    public function loadDescendantIDListInto(&$idList)
+    {
+        if ($children=$this->AllChildren()) {
+            foreach ($children as $child) {
+                if (in_array($child->ID, $idList)) {
                     continue;
                 }
                 $idList[]=$child->ID;
@@ -502,13 +541,14 @@ public function loadDescendantIDListInto(&$idList) {
      * Get the children for this DataObject.
      * @return SS_List
      */
-    public function Children() {
-        if(!(isset($this->_cache_children) && $this->_cache_children)) {
+    public function Children()
+    {
+        if (!(isset($this->_cache_children) && $this->_cache_children)) {
             $result=$this->owner->stageChildren(false);
-            if(isset($result)) {
+            if (isset($result)) {
                 $this->_cache_children=new ArrayList();
-                foreach($result as $child) {
-                    if($child->canView()) {
+                foreach ($result as $child) {
+                    if ($child->canView()) {
                         $this->_cache_children->push($child);
                     }
                 }
@@ -521,7 +561,8 @@ public function Children() {
      * Return all children, including those 'not in menus'.
      * @return SS_List
      */
-    public function AllChildren() {
+    public function AllChildren()
+    {
         return $this->owner->stageChildren(true);
     }
     
@@ -533,7 +574,8 @@ public function AllChildren() {
      * Everything else has "SameOnStage" set, as an indicator that this information has been looked up.
      * @return SS_List
      */
-    public function AllChildrenIncludingDeleted($context=null) {
+    public function AllChildrenIncludingDeleted($context=null)
+    {
         return $this->doAllChildrenIncludingDeleted($context);
     }
     
@@ -543,19 +585,21 @@ public function AllChildrenIncludingDeleted($context=null) {
      * @param unknown_type $context
      * @return SS_List
      */
-    public function doAllChildrenIncludingDeleted($context=null) {
-        if(!$this->owner) user_error('Hierarchy::doAllChildrenIncludingDeleted() called without $this->owner');
+    public function doAllChildrenIncludingDeleted($context=null)
+    {
+        if (!$this->owner) {
+            user_error('Hierarchy::doAllChildrenIncludingDeleted() called without $this->owner');
+        }
     
         $idxStageChildren=array();
         $idxLiveChildren=array();
     
         $baseClass=ClassInfo::baseDataClass($this->owner->class);
-        if($baseClass) {
+        if ($baseClass) {
             $stageChildren=$this->owner->stageChildren(true);
     
             $this->owner->extend("augmentAllChildrenIncludingDeleted", $stageChildren, $context);
-                
-        }else {
+        } else {
             user_error("SnippetHierarchy::AllChildren() Couldn't determine base class for '{$this->owner->class}'", E_USER_ERROR);
         }
     
@@ -569,22 +613,23 @@ public function doAllChildrenIncludingDeleted($context=null) {
      *   (only applicable when extension is applied to {@link SiteTree}).
      * @return SS_List
      */
-    public function stageChildren($showAll=false) {
+    public function stageChildren($showAll=false)
+    {
         $baseClass=ClassInfo::baseDataClass($this->owner->class);
         
-        if($baseClass=='SnippetPackage') {
-            if($this->owner->ID==0) {
+        if ($baseClass=='SnippetPackage') {
+            if ($this->owner->ID==0) {
                 $staged=SnippetPackage::get();
             }
-        }else if($baseClass=='SnippetLanguage') {
-            if($this->owner->ID==0) {
+        } elseif ($baseClass=='SnippetLanguage') {
+            if ($this->owner->ID==0) {
                 $staged=SnippetLanguage::get();
-            }else {
+            } else {
                 $staged=ArrayList::create(array_merge($this->owner->Folders()->toArray(), $this->owner->Snippets()->filter('FolderID', 0)->toArray()));
             }
-        }else if($baseClass=='SnippetFolder') {
+        } elseif ($baseClass=='SnippetFolder') {
             $staged=ArrayList::create(array_merge($this->owner->Folders()->toArray(), $this->owner->Snippets()->toArray()));
-        }else {
+        } else {
             $staged=new ArrayList();
         }
         
@@ -600,10 +645,13 @@ public function stageChildren($showAll=false) {
      * @param String
      * @return String
      */
-    public function getBreadcrumbs($separator=' &raquo; ') {
+    public function getBreadcrumbs($separator=' &raquo; ')
+    {
         $crumbs=array();
         $ancestors=array_reverse($this->owner->getAncestors()->toArray());
-        foreach($ancestors as $ancestor) $crumbs[]=$ancestor->Title;
+        foreach ($ancestors as $ancestor) {
+            $crumbs[]=$ancestor->Title;
+        }
         $crumbs[]=$this->owner->Title;
         return implode($separator, $crumbs);
     }
@@ -614,11 +662,13 @@ public function getBreadcrumbs($separator=' &raquo; ') {
      *
      * @todo Write!
      */
-    public function naturalPrev( $className, $afterNode=null ) {
+    public function naturalPrev($className, $afterNode=null)
+    {
         return null;
     }
     
-    function flushCache() {
+    public function flushCache()
+    {
         $this->_cache_children=null;
         $this->_cache_numChildren=null;
         self::$marked=array();
@@ -626,10 +676,10 @@ function flushCache() {
         self::$treeOpened=array();
     }
     
-    public static function reset() {
+    public static function reset()
+    {
         self::$marked=array();
         self::$expanded=array();
         self::$treeOpened=array();
     }
 }
-?>
\ No newline at end of file
diff --git a/code/forms/CodeBankGridField_ItemRequest.php b/code/forms/CodeBankGridField_ItemRequest.php
index 6113a4b..cdd4b7f 100644
--- a/code/forms/CodeBankGridField_ItemRequest.php
+++ b/code/forms/CodeBankGridField_ItemRequest.php
@@ -1,58 +1,60 @@
-<?php
-class CodeBankGridField_ItemRequest extends GridFieldDetailForm_ItemRequest {
-    private static $allowed_actions=array(
-                                        'ItemEditForm'
-                                    );
-    
-    public function ItemEditForm() {
-        $form=parent::ItemEditForm();
-        
-        $form->Actions()->push(new LiteralField('CodeBankVersion', '<p class="codeBankVersion">Code Bank: '.$this->getVersion().'</p>'));
-        
-        return $form;
-    }
-    
-    /**
-     * Gets the current version of Code Bank
-     * @return {string} Version Number Plus Build Date
-     */
-    final protected function getVersion() {
-        if(CB_VERSION!='@@VERSION@@') {
-            return CB_VERSION.' '.CB_BUILD_DATE;
-        }
-        
-        // Tries to obtain version number from composer.lock if it exists
-        $composerLockPath=BASE_PATH.'/composer.lock';
-        if(file_exists($composerLockPath)) {
-            $cache=SS_Cache::factory('CodeBank_Version');
-            $cacheKey=filemtime($composerLockPath);
-            $version=$cache->load($cacheKey);
-            if($version) {
-                $version=$version;
-            }else {
-                $version='';
-            }
-            
-            if(!$version && $jsonData=file_get_contents($composerLockPath)) {
-                $lockData=json_decode($jsonData);
-                if($lockData && isset($lockData->packages)) {
-                    foreach ($lockData->packages as $package) {
-                        if($package->name=='undefinedoffset/silverstripe-codebank' && isset($package->version)) {
-                            $version=$package->version;
-                            break;
-                        }
-                    }
-                    
-                    $cache->save($version, $cacheKey);
-                }
-            }
-        }
-        
-        if(!empty($version)) {
-            return $version;
-        }
-        
-        return _t('CodeBank.DEVELOPMENT_BUILD', '_Development Build');
-    }
-}
-?>
\ No newline at end of file
+<?php
+class CodeBankGridField_ItemRequest extends GridFieldDetailForm_ItemRequest
+{
+    private static $allowed_actions=array(
+                                        'ItemEditForm'
+                                    );
+    
+    public function ItemEditForm()
+    {
+        $form=parent::ItemEditForm();
+        
+        $form->Actions()->push(new LiteralField('CodeBankVersion', '<p class="codeBankVersion">Code Bank: '.$this->getVersion().'</p>'));
+        
+        return $form;
+    }
+    
+    /**
+     * Gets the current version of Code Bank
+     * @return {string} Version Number Plus Build Date
+     */
+    final protected function getVersion()
+    {
+        if (CB_VERSION!='@@VERSION@@') {
+            return CB_VERSION.' '.CB_BUILD_DATE;
+        }
+        
+        // Tries to obtain version number from composer.lock if it exists
+        $composerLockPath=BASE_PATH.'/composer.lock';
+        if (file_exists($composerLockPath)) {
+            $cache=SS_Cache::factory('CodeBank_Version');
+            $cacheKey=filemtime($composerLockPath);
+            $version=$cache->load($cacheKey);
+            if ($version) {
+                $version=$version;
+            } else {
+                $version='';
+            }
+            
+            if (!$version && $jsonData=file_get_contents($composerLockPath)) {
+                $lockData=json_decode($jsonData);
+                if ($lockData && isset($lockData->packages)) {
+                    foreach ($lockData->packages as $package) {
+                        if ($package->name=='undefinedoffset/silverstripe-codebank' && isset($package->version)) {
+                            $version=$package->version;
+                            break;
+                        }
+                    }
+                    
+                    $cache->save($version, $cacheKey);
+                }
+            }
+        }
+        
+        if (!empty($version)) {
+            return $version;
+        }
+        
+        return _t('CodeBank.DEVELOPMENT_BUILD', '_Development Build');
+    }
+}
diff --git a/code/forms/ExportPackageButton.php b/code/forms/ExportPackageButton.php
index 968d1bd..13a5856 100644
--- a/code/forms/ExportPackageButton.php
+++ b/code/forms/ExportPackageButton.php
@@ -1,13 +1,14 @@
-<?php
-class ExportPackageButton extends GridFieldViewButton {
-    public function getColumnContent($field, $record, $col) {
-        if($record->canView()) {
-            $data=new ArrayData(array(
-                                    'Link'=>'code-bank-api/export-package?id='.$record->ID
-                                ));
-            
-            return $data->renderWith('ExportPackageButton');
-        }
-    }
-}
-?>
\ No newline at end of file
+<?php
+class ExportPackageButton extends GridFieldViewButton
+{
+    public function getColumnContent($field, $record, $col)
+    {
+        if ($record->canView()) {
+            $data=new ArrayData(array(
+                                    'Link'=>'code-bank-api/export-package?id='.$record->ID
+                                ));
+            
+            return $data->renderWith('ExportPackageButton');
+        }
+    }
+}
diff --git a/code/forms/HighlightedContentField.php b/code/forms/HighlightedContentField.php
index 0b4fc3e..c686909 100644
--- a/code/forms/HighlightedContentField.php
+++ b/code/forms/HighlightedContentField.php
@@ -1,176 +1,185 @@
-<?php
-class HighlightedContentField extends FormField {
-    protected $language;
-    
-    public function __construct($name, $title=null, $language=null, $value=null) {
-        parent::__construct($name, $title, $value);
-        
-        $this->language=$language;
-        $this->extraClasses['stacked']='stacked';
-    }
-    
-    /**
-     * @return array
-     */
-    public function getAttributes() {
-        $attrs=array(
-                    'type'=>'hidden',
-                    'name'=>$this->getName(),
-                    'value'=>$this->Value(),
-                    'class'=>$this->extraClass(),
-                    'id'=>$this->ID(),
-                    'disabled'=>$this->isDisabled(),
-                    'title'=>$this->getDescription(),
-                );
-        
-        return array_merge($attrs, $this->attributes);
-    }
-    
-    /**
-     * Returns the form field - used by templates. Although FieldHolder is generally what is inserted into templates, all of the field holder templates make use of $Field.  It's expected that FieldHolder will give you the "complete" representation of the field on the form, whereas Field will give you the core editing widget, such as an input tag.
-     * @param {array} $properties key value pairs of template variables
-     * @return {string} Returns the html to be sent to the browser
-     */
-    public function Field($properties=array()) {
-        $obj=($properties ? $this->customise($properties):$this);
-        
-        
-        Requirements::css(CB_DIR.'/javascript/external/syntaxhighlighter/themes/shCore.css');
-        Requirements::css(CB_DIR.'/javascript/external/syntaxhighlighter/themes/shCore'.$this->theme_file().'.css');
-        Requirements::css(CB_DIR.'/javascript/external/syntaxhighlighter/themes/shTheme'.$this->theme_file().'.css');
-        Requirements::css(CB_DIR.'/css/HighlightedContentField.css');
-        
-        Requirements::javascript(CB_DIR.'/javascript/external/syntaxhighlighter/brushes/shCore.js');
-        
-        $brushName=$this->getBrushName();
-        if(!empty($brushName)) {
-            Requirements::javascript(CB_DIR.'/javascript/external/syntaxhighlighter/brushes/'.$this->getBrushName().'.js');
-        }else {
-            $lang=SnippetLanguage::get()->filter('HighlightCode', Convert::raw2sql($this->language))->filter('UserLanguage', true)->first();
-            if(!empty($lang) && $lang!==false && $lang->ID>0 && !empty($lang->BrushFile)) {
-                Requirements::javascript($lang->BrushFile);
-            }
-        }
-        
-        Requirements::javascript(CB_DIR.'/javascript/HighlightedContentField.js');
-        
-        
-        return $obj->renderWith('HighlightedContentField');
-    }
-    
-    /**
-     * Gets the brush name
-     * @return {string} Name of the file used for the syntax highlighter brush
-     */
-    public function getBrushName() {
-        switch(strtolower($this->language)) {
-            case 'applescript':return 'shBrushAppleScript';
-            case 'actionscript3':
-            case 'as3':return 'shBrushAS3';
-            case 'mxml':
-            case 'flex':return 'shBrushFlex';
-            case 'bash':
-            case 'shell':return 'shBrushBash';
-            case 'coldfusion':
-            case 'cf':return 'shBrushColdFusion';
-            case 'cpp':
-            case 'c':return 'shBrushCpp';
-            case 'c#':
-            case 'c-sharp':
-            case 'csharp':return 'shBrushCSharp';
-            case 'css':return 'shBrushCss';
-            case 'delphi':
-            case 'pascal':return 'shBrushDelphi';
-            case 'diff':
-            case 'patch':
-            case 'pas':return 'shBrushDiff';
-            case 'erl':
-            case 'erlang':return 'shBrushErlang';
-            case 'groovy':return 'shBrushGroovy';
-            case 'java':return 'shBrushJava';
-            case 'jfx':
-            case 'javafx':return 'shBrushJavaFX';
-            case 'js':
-            case 'jscript':
-            case 'javascript':return 'shBrushJScript';
-            case 'perl':
-            case 'pl':return 'shBrushPerl';
-            case 'php':return 'shBrushPhp';
-            case 'text':
-            case 'plain':return 'shBrushPlain';
-            case 'py':
-            case 'python':return 'shBrushPython';
-            case 'ruby':
-            case 'rails':
-            case 'ror':
-            case 'rb':return 'shBrushRuby';
-            case 'sass':
-            case 'scss':return 'shBrushSass';
-            case 'scala':return 'shBrushScala';
-            case 'ss':
-            case 'silverstripe':return 'shBrushSilverStripe';
-            case 'sql':return 'shBrushSql';
-            case 'vb':
-            case 'vbnet':return 'shBrushVb';
-            case 'xml':
-            case 'xhtml':
-            case 'xslt':
-            case 'html':return 'shBrushXml';
-            case 'yml':
-            case 'yaml':return 'shBrushYaml';
-        }
-    }
-    
-    /**
-     * sets the language used for syntax highlighter
-     * @param {string} $lang Language code
-     */
-    public function setLanguage($lang) {
-        $this->language=$lang;
-    }
-    
-    /**
-     * Gets the language used for syntax highlighter
-     * @return {string} Language code
-     */
-    public function getLanguage() {
-        return $this->language;
-    }
-    
-    /**
-     * Gets the highlight code used for syntax highlighter
-     * @return {string} Language code
-     */
-    public function getHighlightCode() {
-        return strtolower($this->language);
-    }
-    
-    /**
-     * Detects the theme based on the current config
-     * @return {string} Theme based on looking at the value in config, if its not valid or not present use 'Default'
-     */
-    protected function theme_file() {
-        switch(HighlightedContentField::config()->theme) {
-            case 'Django':
-            case 'Eclipse':
-            case 'Emacs':
-            case 'FadeToGrey':
-            case 'MDUltra':
-            case 'FlashDevelop':
-            case 'FlexBuilder':
-            case 'RDark':return HighlightedContentField::config()->theme;
-            default:return 'Default';
-        }
-    }
-    
-    /**
-     * Returns a readonly version of this field
-     */
-    public function performReadonlyTransformation() {
-        $field=clone $this;
-        $field->setReadonly(true);
-        
-        return $field;
-    }
-}
-?>
\ No newline at end of file
+<?php
+class HighlightedContentField extends FormField
+{
+    protected $language;
+    
+    public function __construct($name, $title=null, $language=null, $value=null)
+    {
+        parent::__construct($name, $title, $value);
+        
+        $this->language=$language;
+        $this->extraClasses['stacked']='stacked';
+    }
+    
+    /**
+     * @return array
+     */
+    public function getAttributes()
+    {
+        $attrs=array(
+                    'type'=>'hidden',
+                    'name'=>$this->getName(),
+                    'value'=>$this->Value(),
+                    'class'=>$this->extraClass(),
+                    'id'=>$this->ID(),
+                    'disabled'=>$this->isDisabled(),
+                    'title'=>$this->getDescription(),
+                );
+        
+        return array_merge($attrs, $this->attributes);
+    }
+    
+    /**
+     * Returns the form field - used by templates. Although FieldHolder is generally what is inserted into templates, all of the field holder templates make use of $Field.  It's expected that FieldHolder will give you the "complete" representation of the field on the form, whereas Field will give you the core editing widget, such as an input tag.
+     * @param {array} $properties key value pairs of template variables
+     * @return {string} Returns the html to be sent to the browser
+     */
+    public function Field($properties=array())
+    {
+        $obj=($properties ? $this->customise($properties):$this);
+        
+        
+        Requirements::css(CB_DIR.'/javascript/external/syntaxhighlighter/themes/shCore.css');
+        Requirements::css(CB_DIR.'/javascript/external/syntaxhighlighter/themes/shCore'.$this->theme_file().'.css');
+        Requirements::css(CB_DIR.'/javascript/external/syntaxhighlighter/themes/shTheme'.$this->theme_file().'.css');
+        Requirements::css(CB_DIR.'/css/HighlightedContentField.css');
+        
+        Requirements::javascript(CB_DIR.'/javascript/external/syntaxhighlighter/brushes/shCore.js');
+        
+        $brushName=$this->getBrushName();
+        if (!empty($brushName)) {
+            Requirements::javascript(CB_DIR.'/javascript/external/syntaxhighlighter/brushes/'.$this->getBrushName().'.js');
+        } else {
+            $lang=SnippetLanguage::get()->filter('HighlightCode', Convert::raw2sql($this->language))->filter('UserLanguage', true)->first();
+            if (!empty($lang) && $lang!==false && $lang->ID>0 && !empty($lang->BrushFile)) {
+                Requirements::javascript($lang->BrushFile);
+            }
+        }
+        
+        Requirements::javascript(CB_DIR.'/javascript/HighlightedContentField.js');
+        
+        
+        return $obj->renderWith('HighlightedContentField');
+    }
+    
+    /**
+     * Gets the brush name
+     * @return {string} Name of the file used for the syntax highlighter brush
+     */
+    public function getBrushName()
+    {
+        switch (strtolower($this->language)) {
+            case 'applescript':return 'shBrushAppleScript';
+            case 'actionscript3':
+            case 'as3':return 'shBrushAS3';
+            case 'mxml':
+            case 'flex':return 'shBrushFlex';
+            case 'bash':
+            case 'shell':return 'shBrushBash';
+            case 'coldfusion':
+            case 'cf':return 'shBrushColdFusion';
+            case 'cpp':
+            case 'c':return 'shBrushCpp';
+            case 'c#':
+            case 'c-sharp':
+            case 'csharp':return 'shBrushCSharp';
+            case 'css':return 'shBrushCss';
+            case 'delphi':
+            case 'pascal':return 'shBrushDelphi';
+            case 'diff':
+            case 'patch':
+            case 'pas':return 'shBrushDiff';
+            case 'erl':
+            case 'erlang':return 'shBrushErlang';
+            case 'groovy':return 'shBrushGroovy';
+            case 'java':return 'shBrushJava';
+            case 'jfx':
+            case 'javafx':return 'shBrushJavaFX';
+            case 'js':
+            case 'jscript':
+            case 'javascript':return 'shBrushJScript';
+            case 'perl':
+            case 'pl':return 'shBrushPerl';
+            case 'php':return 'shBrushPhp';
+            case 'text':
+            case 'plain':return 'shBrushPlain';
+            case 'py':
+            case 'python':return 'shBrushPython';
+            case 'ruby':
+            case 'rails':
+            case 'ror':
+            case 'rb':return 'shBrushRuby';
+            case 'sass':
+            case 'scss':return 'shBrushSass';
+            case 'scala':return 'shBrushScala';
+            case 'ss':
+            case 'silverstripe':return 'shBrushSilverStripe';
+            case 'sql':return 'shBrushSql';
+            case 'vb':
+            case 'vbnet':return 'shBrushVb';
+            case 'xml':
+            case 'xhtml':
+            case 'xslt':
+            case 'html':return 'shBrushXml';
+            case 'yml':
+            case 'yaml':return 'shBrushYaml';
+        }
+    }
+    
+    /**
+     * sets the language used for syntax highlighter
+     * @param {string} $lang Language code
+     */
+    public function setLanguage($lang)
+    {
+        $this->language=$lang;
+    }
+    
+    /**
+     * Gets the language used for syntax highlighter
+     * @return {string} Language code
+     */
+    public function getLanguage()
+    {
+        return $this->language;
+    }
+    
+    /**
+     * Gets the highlight code used for syntax highlighter
+     * @return {string} Language code
+     */
+    public function getHighlightCode()
+    {
+        return strtolower($this->language);
+    }
+    
+    /**
+     * Detects the theme based on the current config
+     * @return {string} Theme based on looking at the value in config, if its not valid or not present use 'Default'
+     */
+    protected function theme_file()
+    {
+        switch (HighlightedContentField::config()->theme) {
+            case 'Django':
+            case 'Eclipse':
+            case 'Emacs':
+            case 'FadeToGrey':
+            case 'MDUltra':
+            case 'FlashDevelop':
+            case 'FlexBuilder':
+            case 'RDark':return HighlightedContentField::config()->theme;
+            default:return 'Default';
+        }
+    }
+    
+    /**
+     * Returns a readonly version of this field
+     */
+    public function performReadonlyTransformation()
+    {
+        $field=clone $this;
+        $field->setReadonly(true);
+        
+        return $field;
+    }
+}
diff --git a/code/forms/PackageSelectionField.php b/code/forms/PackageSelectionField.php
index baa86ec..7c7a14d 100644
--- a/code/forms/PackageSelectionField.php
+++ b/code/forms/PackageSelectionField.php
@@ -1,5 +1,6 @@
 <?php
-class PackageSelectionField extends DropdownField {
+class PackageSelectionField extends DropdownField
+{
     protected $extraClasses=array(
                                 'dropdown'
                             );
@@ -16,7 +17,8 @@ class PackageSelectionField extends DropdownField {
      * @param {array} $properties Key value pairs of template variables
      * @return {string}
      */
-    public function FieldHolder($properties=array()) {
+    public function FieldHolder($properties=array())
+    {
         Requirements::css(CB_DIR.'/css/PackageSelectionField.css');
         Requirements::javascript(CB_DIR.'/javascript/PackageSelectionField.js');
         
@@ -27,7 +29,8 @@ public function FieldHolder($properties=array()) {
      * Handles requests for the add package dialog
      * @return {string} HTML to be rendered
      */
-    public function addPackage() {
+    public function addPackage()
+    {
         return $this->renderWith('CMSDialog', array(
                                                     'Form'=>$this->AddPackageForm()
                                                 ));
@@ -37,7 +40,8 @@ public function addPackage() {
      * Generates the form for adding packages
      * @return {Form} Form to be used
      */
-    public function AddPackageForm() {
+    public function AddPackageForm()
+    {
         $sng=singleton('SnippetPackage');
         
         $fields=new FieldList(
@@ -70,9 +74,10 @@ public function AddPackageForm() {
      * @param {Form} $form Submitting form
      * @return {mixed}
      */
-    public function doAddPackage($data, Form $form) {
+    public function doAddPackage($data, Form $form)
+    {
         $record=new SnippetPackage();
-        if($record->canEdit()) {
+        if ($record->canEdit()) {
             $form->saveInto($record);
             $record->write();
             
@@ -89,9 +94,9 @@ public function doAddPackage($data, Form $form) {
      * @param {SS_HTTPRequest} $request HTTP Request Data
      * @return {string} HTML to be returned
      */
-    public function ReloadField(SS_HTTPRequest $request) {
+    public function ReloadField(SS_HTTPRequest $request)
+    {
         $this->value=$request->getVar('id');
         return $this->FieldHolder();
     }
 }
-?>
\ No newline at end of file
diff --git a/code/forms/PackageViewButton.php b/code/forms/PackageViewButton.php
index 7ff5be0..36fed2c 100644
--- a/code/forms/PackageViewButton.php
+++ b/code/forms/PackageViewButton.php
@@ -1,13 +1,14 @@
-<?php
-class PackageViewButton extends GridFieldViewButton {
-    public function getColumnContent($field, $record, $col) {
-        if($record->canView()) {
-            $data=new ArrayData(array(
-                                    'Link'=>'admin/codeBank/show/'.$record->ID
-                                ));
-            
-            return $data->renderWith('GridFieldViewButton');
-        }
-    }
-}
-?>
\ No newline at end of file
+<?php
+class PackageViewButton extends GridFieldViewButton
+{
+    public function getColumnContent($field, $record, $col)
+    {
+        if ($record->canView()) {
+            $data=new ArrayData(array(
+                                    'Link'=>'admin/codeBank/show/'.$record->ID
+                                ));
+            
+            return $data->renderWith('GridFieldViewButton');
+        }
+    }
+}
diff --git a/code/forms/PackageViewField.php b/code/forms/PackageViewField.php
index bef4a3b..003d84f 100644
--- a/code/forms/PackageViewField.php
+++ b/code/forms/PackageViewField.php
@@ -1,100 +1,109 @@
-<?php
-class PackageViewField extends FormField {
-    protected $sourceList;
-    protected $showNested=true;
-    protected $currentSnippetID=-1;
-    
-    /**
-     * Initializes the Package View List
-     * @param {string} $name Name of the field
-     * @param {string} $title Title of the field
-     * @param {SS_List} $sourceList Source List to be used
-     * @param {mixed} $value Value of the field
-     */
-    public function __construct($name, $title, $sourceList, $currentSnippetID=-1, $value=null) {
-        $this->sourceList=$sourceList;
-        $this->currentSnippetID=$currentSnippetID;
-        
-        parent::__construct($name, $title, $value);
-    }
-    
-    /**
-     * Sets the source list
-     * @param {SS_List} $list Source List
-     * @return {PackageViewField} Returns this
-     */
-    public function setSourceList($list) {
-        $this->sourceList=$list;
-        
-        return $this;
-    }
-    
-    /**
-     * Gets the source list
-     * @return {SS_List} Source List
-     */
-    public function getSourceList() {
-        return $this->sourceList;
-    }
-    
-    /**
-     * Show the nested package contents
-     * @param {bool} $val Value to set to
-     * @return {PackageViewField} Returns this
-     */
-    public function setShowNested($val) {
-        $this->showNested=false;
-        
-        return $this;
-    }
-    
-    /**
-     * Gets the whether to show the nested package contents or not
-     * @return {bool} Returns boolean true to show false otherwise
-     */
-    public function getShowNested() {
-        return $this->showNested;
-    }
-    
-    /**
-     * Returns a "field holder" for this field - used by templates.
-     * @param {array} $properties key value pairs of template variables
-     * @return {string} HTML to be used
-     */
-    public function FieldHolder($properties=array()) {
-        $obj=($properties ? $this->customise($properties):$this);
-        
-        
-        Requirements::css(CB_DIR.'/css/PackageViewField.css');
-        Requirements::javascript(CB_DIR.'/javascript/PackageViewField.js');
-        
-        return $obj->renderWith($this->getFieldHolderTemplates());
-    }
-    
-    /**
-     * Sets the current snippet id
-     * @param {int} ID of the current snippet
-     * @return {PackageViewField} Returns this
-     */
-    public function setCurrentSnippetID() {
-        $this->currentSnippetID=$id;
-        
-        return $this;
-    }
-    
-    /**
-     * Gets the current snippet id
-     * @return {int} ID of the current snippet
-     */
-    public function getCurrentSnippetID() {
-        return $this->currentSnippetID;
-    }
-    
-    /**
-     * Returns a readonly version of this field
-     */
-    public function performReadonlyTransformation() {
-        return $this;
-    }
-}
-?>
\ No newline at end of file
+<?php
+class PackageViewField extends FormField
+{
+    protected $sourceList;
+    protected $showNested=true;
+    protected $currentSnippetID=-1;
+    
+    /**
+     * Initializes the Package View List
+     * @param {string} $name Name of the field
+     * @param {string} $title Title of the field
+     * @param {SS_List} $sourceList Source List to be used
+     * @param {mixed} $value Value of the field
+     */
+    public function __construct($name, $title, $sourceList, $currentSnippetID=-1, $value=null)
+    {
+        $this->sourceList=$sourceList;
+        $this->currentSnippetID=$currentSnippetID;
+        
+        parent::__construct($name, $title, $value);
+    }
+    
+    /**
+     * Sets the source list
+     * @param {SS_List} $list Source List
+     * @return {PackageViewField} Returns this
+     */
+    public function setSourceList($list)
+    {
+        $this->sourceList=$list;
+        
+        return $this;
+    }
+    
+    /**
+     * Gets the source list
+     * @return {SS_List} Source List
+     */
+    public function getSourceList()
+    {
+        return $this->sourceList;
+    }
+    
+    /**
+     * Show the nested package contents
+     * @param {bool} $val Value to set to
+     * @return {PackageViewField} Returns this
+     */
+    public function setShowNested($val)
+    {
+        $this->showNested=false;
+        
+        return $this;
+    }
+    
+    /**
+     * Gets the whether to show the nested package contents or not
+     * @return {bool} Returns boolean true to show false otherwise
+     */
+    public function getShowNested()
+    {
+        return $this->showNested;
+    }
+    
+    /**
+     * Returns a "field holder" for this field - used by templates.
+     * @param {array} $properties key value pairs of template variables
+     * @return {string} HTML to be used
+     */
+    public function FieldHolder($properties=array())
+    {
+        $obj=($properties ? $this->customise($properties):$this);
+        
+        
+        Requirements::css(CB_DIR.'/css/PackageViewField.css');
+        Requirements::javascript(CB_DIR.'/javascript/PackageViewField.js');
+        
+        return $obj->renderWith($this->getFieldHolderTemplates());
+    }
+    
+    /**
+     * Sets the current snippet id
+     * @param {int} ID of the current snippet
+     * @return {PackageViewField} Returns this
+     */
+    public function setCurrentSnippetID()
+    {
+        $this->currentSnippetID=$id;
+        
+        return $this;
+    }
+    
+    /**
+     * Gets the current snippet id
+     * @return {int} ID of the current snippet
+     */
+    public function getCurrentSnippetID()
+    {
+        return $this->currentSnippetID;
+    }
+    
+    /**
+     * Returns a readonly version of this field
+     */
+    public function performReadonlyTransformation()
+    {
+        return $this;
+    }
+}
diff --git a/code/forms/TagsViewField.php b/code/forms/TagsViewField.php
index c536034..2849624 100644
--- a/code/forms/TagsViewField.php
+++ b/code/forms/TagsViewField.php
@@ -1,17 +1,18 @@
-<?php
-class TagsViewField extends ReadonlyField {
-    public function Value() {
-        if($this->value) {
-            $val=Convert::raw2xml($this->value);
-            $val=explode(',', $val);
-            foreach($val as $key=>$value) {
-                $val[$key]='<a href="'.$this->form->Controller()->Link().'?tag='.rawurlencode($value).'">'.$value.'</a>';
-            }
-            
-            return implode(', ', $val);
-        }else {
-            return '<i>('._t('FormField.NONE', 'none').')</i>';
-        }
-    }
-}
-?>
\ No newline at end of file
+<?php
+class TagsViewField extends ReadonlyField
+{
+    public function Value()
+    {
+        if ($this->value) {
+            $val=Convert::raw2xml($this->value);
+            $val=explode(',', $val);
+            foreach ($val as $key=>$value) {
+                $val[$key]='<a href="'.$this->form->Controller()->Link().'?tag='.rawurlencode($value).'">'.$value.'</a>';
+            }
+            
+            return implode(', ', $val);
+        } else {
+            return '<i>('._t('FormField.NONE', 'none').')</i>';
+        }
+    }
+}
diff --git a/code/interfaces/CodeBank_APIClass.php b/code/interfaces/CodeBank_APIClass.php
index 92b1ae8..06d85d3 100644
--- a/code/interfaces/CodeBank_APIClass.php
+++ b/code/interfaces/CodeBank_APIClass.php
@@ -1,9 +1,9 @@
 <?php
-interface CodeBank_APIClass {
+interface CodeBank_APIClass
+{
     /**
      * Gets the permissions required to access the class
      * @return {array} Array of permission names to check
      */
     public function getRequiredPermissions();
 }
-?>
\ No newline at end of file
diff --git a/code/model/CodeBankConfig.php b/code/model/CodeBankConfig.php
index 0e62ff8..65124ef 100644
--- a/code/model/CodeBankConfig.php
+++ b/code/model/CodeBankConfig.php
@@ -1,5 +1,6 @@
 <?php
-class CodeBankConfig extends DataObject {
+class CodeBankConfig extends DataObject
+{
     private static $db=array(
                             'IPMessage'=>'HTMLText',
                             'Version'=>'Varchar(30)'
@@ -13,8 +14,9 @@ class CodeBankConfig extends DataObject {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can view false otherwise
      */
-    public function canView($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canView($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -26,8 +28,9 @@ public function canView($member=null) {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can edit false otherwise
      */
-    public function canEdit($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canEdit($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -39,7 +42,8 @@ public function canEdit($member=null) {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can delete false otherwise
      */
-    public function canDelete($member=null) {
+    public function canDelete($member=null)
+    {
         return false;
     }
     
@@ -48,20 +52,22 @@ public function canDelete($member=null) {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can create false otherwise
      */
-    public function canCreate($member=null) {
+    public function canCreate($member=null)
+    {
         return false;
     }
     
     /**
      * Creates the default code bank config
      */
-    public function requireDefaultRecords() {
+    public function requireDefaultRecords()
+    {
         parent::requireDefaultRecords();
         
         
         $codeVersion=singleton('CodeBank')->getVersion();
         
-        if(!CodeBankConfig::get()->first()) {
+        if (!CodeBankConfig::get()->first()) {
             $conf=new CodeBankConfig();
             $conf->Version=$codeVersion;
             $conf->write();
@@ -70,7 +76,7 @@ public function requireDefaultRecords() {
         }
         
         
-        if(!Group::get()->filter('Code', 'code-bank-api')->first()) {
+        if (!Group::get()->filter('Code', 'code-bank-api')->first()) {
             $group=new Group();
             $group->Title='Code Bank Users';
             $group->Description='Code Bank Access Group';
@@ -90,25 +96,25 @@ public function requireDefaultRecords() {
         //Check for and perform any needed updates
         $codeVersionTmp=explode(' ', $codeVersion);
         $dbVerTmp=explode(' ', CodeBankConfig::CurrentConfig()->Version);
-        if($codeVersionTmp[0]!='@@VERSION@@' && $codeVersionTmp[0]!=$dbVerTmp[0]) {
+        if ($codeVersionTmp[0]!='@@VERSION@@' && $codeVersionTmp[0]!=$dbVerTmp[0]) {
             $updateXML=simplexml_load_string(file_get_contents('http://update.edchipman.ca/codeBank/airUpdate.xml'));
             $latestVersion=strip_tags($updateXML->version->asXML());
             $versionTmp=explode(' ', $latestVersion);
             
             //Sanity Check code version against latest
-            if(version_compare($codeVersionTmp[0], $versionTmp[0], '>')) {
+            if (version_compare($codeVersionTmp[0], $versionTmp[0], '>')) {
                 DB::alteration_message('Unknown Code Bank server version '.$codeVersion.', current version available for download is '.$latestVersion, 'error');
                 return;
             }
             
             //Sanity Check make sure latest version is installed
-            if($codeVersionTmp[0]!=$versionTmp[0]) {
+            if ($codeVersionTmp[0]!=$versionTmp[0]) {
                 DB::alteration_message('A Code Bank Server update is available, please <a href="http://programs.edchipman.ca/applications/code-bank/">download</a> and install the update then run dev/build again.', 'error');
                 return;
             }
             
             //Sanity Check database version against latest
-            if(version_compare($dbVerTmp[0], $versionTmp[0], '<')) {
+            if (version_compare($dbVerTmp[0], $versionTmp[0], '<')) {
                 $data=array(
                             'version'=>CodeBankConfig::CurrentConfig()->Version,
                             'db_type'=>'SERVER'
@@ -130,12 +136,12 @@ public function requireDefaultRecords() {
                 //Download and run queries needed
                 $sql=simplexml_load_string(file_get_contents('http://update.edchipman.ca/codeBank/DatabaseUpgrade.php', false, $context));
                 $sets=count($sql->query);
-                foreach($sql->query as $query) {
-                    $queries=explode('$',$query);
+                foreach ($sql->query as $query) {
+                    $queries=explode('$', $query);
                     $t=count($queries);
                 
-                    foreach($queries as $query) {
-                        if(empty($query)) {
+                    foreach ($queries as $query) {
+                        if (empty($query)) {
                             continue;
                         }
                 
@@ -159,8 +165,9 @@ public function requireDefaultRecords() {
      * Gets the current config
      * @return {CodeBankConfig} Code Bank Config Data
      */
-    public static function CurrentConfig() {
-        if(empty(self::$_currentConfig)) {
+    public static function CurrentConfig()
+    {
+        if (empty(self::$_currentConfig)) {
             self::$_currentConfig=CodeBankConfig::get()->first();
         }
         
@@ -172,7 +179,8 @@ public static function CurrentConfig() {
      * Gets fields used in the cms
      * @return {FieldList} Fields to be used
      */
-    public function getCMSFields() {
+    public function getCMSFields()
+    {
         $langGridConfig=GridFieldConfig_RecordEditor::create(30);
         $langGridConfig->getComponentByType('GridFieldDetailForm')->setItemRequestClass('CodeBankGridField_ItemRequest');
         $langGridConfig->getComponentByType('GridFieldDataColumns')->setFieldCasting(array(
@@ -182,17 +190,17 @@ public function getCMSFields() {
         
         $packageGridConfig=GridFieldConfig_RecordEditor::create(30);
         $packageGridConfig->addComponent(new ExportPackageButton());
-        $packageGridConfig->getComponentByType('GridFieldDetailForm')->setItemRequestClass('CodeBankGridField_ItemRequest')->setItemEditFormCallback(function(Form $form, GridFieldDetailForm_ItemRequest $itemRequest) {
+        $packageGridConfig->getComponentByType('GridFieldDetailForm')->setItemRequestClass('CodeBankGridField_ItemRequest')->setItemEditFormCallback(function (Form $form, GridFieldDetailForm_ItemRequest $itemRequest) {
                                                                                                     Requirements::javascript(CB_DIR.'/javascript/SnippetPackages.ItemEditForm.js');
                                                                                                     
-                                                                                                    if($form->getRecord() && $form->getRecord()->ID>0) {
+                                                                                                    if ($form->getRecord() && $form->getRecord()->ID>0) {
                                                                                                         $form->Actions()->push(FormAction::create('doExportPackage', _t('CodeBank.EXPORT', '_Export'))->setForm($form));
                                                                                                     }
                                                                                                     
                                                                                                     $form->addExtraClass('CodeBankPackages');
                                                                                                 });
         
-        if(Permission::check('ADMIN')) {
+        if (Permission::check('ADMIN')) {
             $fields=new FieldList(
                                 new TabSet('Root',
                                         new Tab('Main', _t('CodeBankConfig.MAIN', '_IP Message'),
@@ -206,7 +214,7 @@ public function getCMSFields() {
                                             )
                                     )
                             );
-        }else {
+        } else {
             $fields=new FieldList(
                                 new TabSet('Root',
                                                 new Tab('Packages', _t('CodeBank.PACKAGES', '_Packages'),
@@ -219,4 +227,3 @@ public function getCMSFields() {
         return $fields;
     }
 }
-?>
\ No newline at end of file
diff --git a/code/model/Snippet.php b/code/model/Snippet.php
index d5f18ad..515b0c0 100644
--- a/code/model/Snippet.php
+++ b/code/model/Snippet.php
@@ -1,5 +1,6 @@
 <?php
-class Snippet extends DataObject {
+class Snippet extends DataObject
+{
     private static $db=array(
                             'Title'=>'Varchar(300)',
                             'Description'=>'Varchar(600)',
@@ -33,8 +34,9 @@ class Snippet extends DataObject {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can view false otherwise
      */
-    public function canView($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canView($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -46,8 +48,9 @@ public function canView($member=null) {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can edit false otherwise
      */
-    public function canEdit($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canEdit($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -59,8 +62,9 @@ public function canEdit($member=null) {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can delete false otherwise
      */
-    public function canDelete($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canDelete($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -72,8 +76,9 @@ public function canDelete($member=null) {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can create false otherwise
      */
-    public function canCreate($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canCreate($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -83,12 +88,13 @@ public function canCreate($member=null) {
     /**
      * Check the database schema and update it as necessary.
      */
-    public function requireTable() {
+    public function requireTable()
+    {
         //Init the search engine
         $searchEngine=Config::inst()->get('CodeBank', 'snippet_search_engine');
-        if($searchEngine && class_exists($searchEngine) && in_array('ICodeBankSearchEngine', class_implements($searchEngine))) {
+        if ($searchEngine && class_exists($searchEngine) && in_array('ICodeBankSearchEngine', class_implements($searchEngine))) {
             $searchEngine::requireTable();
-        }else {
+        } else {
             //Class is missing or invalid so fallback to the default
             DefaultCodeBankSearchEngine::requireTable();
         }
@@ -102,7 +108,8 @@ public function requireTable() {
      * Gets fields used in the cms
      * @return {FieldList} Fields to be used
      */
-    public function getCMSFields() {
+    public function getCMSFields()
+    {
         $fields=new FieldList(
                             new TabSet('Root',
                                 new Tab('Main', _t('Snippet.MAIN', '_Main'),
@@ -124,7 +131,8 @@ public function getCMSFields() {
      * Gets validator used in the cms
      * @return {RequiredFields} Required fields validator
      */
-    public function getCMSValidator() {
+    public function getCMSValidator()
+    {
         return new RequiredFields(
                                 'LanguageID',
                                 'Title',
@@ -136,16 +144,17 @@ public function getCMSValidator() {
     /**
      * Sets the creator id for new snippets and sets the last editor id for existing snippets
      */
-    protected function onBeforeWrite() {
+    protected function onBeforeWrite()
+    {
         parent::onBeforeWrite();
         
-        if($this->ID==0) {
+        if ($this->ID==0) {
             $this->CreatorID=Member::currentUserID();
-        }else {
+        } else {
             $this->LastEditorID=Member::currentUserID();
             
             //If the language is changing reset the folder id
-            if($this->isChanged('LanguageID')) {
+            if ($this->isChanged('LanguageID')) {
                 $this->FolderID=0;
             }
         }
@@ -154,11 +163,12 @@ protected function onBeforeWrite() {
     /**
      * Creates the snippet version record after writing
      */
-    protected function onAfterWrite() {
+    protected function onAfterWrite()
+    {
         parent::onAfterWrite();
         
         //Write the snippet version record
-        if(!empty($this->Text)) {
+        if (!empty($this->Text)) {
             $version=new SnippetVersion();
             $version->Text=$this->Text;
             $version->ParentID=$this->ID;
@@ -169,7 +179,8 @@ protected function onAfterWrite() {
     /**
      * Removes all version history for this snippet before deleting the snippet record
      */
-    protected function onBeforeDelete() {
+    protected function onBeforeDelete()
+    {
         parent::onBeforeDelete();
         
         SnippetVersion::get()->filter('ParentID', $this->ID)->removeAll();
@@ -179,7 +190,8 @@ protected function onBeforeDelete() {
      * Gets the current version
      * @return {SnippetVersion} Current version of the snippet
      */
-    public function getCurrentVersion() {
+    public function getCurrentVersion()
+    {
         return $this->Versions()->First();
     }
     
@@ -187,9 +199,10 @@ public function getCurrentVersion() {
      * Gets the id from the latest snippet version
      * @return {string} Snippet text
      */
-    public function getCurrentVersionID() {
+    public function getCurrentVersionID()
+    {
         $version=$this->CurrentVersion;
-        if($version) {
+        if ($version) {
             return $version->ID;
         }
     }
@@ -198,9 +211,10 @@ public function getCurrentVersionID() {
      * Gets the text from the latest snippet version
      * @return {string} Snippet text
      */
-    public function getSnippetText() {
+    public function getSnippetText()
+    {
         $version=$this->CurrentVersion;
-        if($version) {
+        if ($version) {
             return $version->Text;
         }
     }
@@ -210,7 +224,8 @@ public function getSnippetText() {
      * @param {int} $id Version to fetch
      * @return {SnippetVersion} Snippet Version record
      */
-    public function Version($id) {
+    public function Version($id)
+    {
         return $this->Versions()->byID($id);
     }
     
@@ -218,8 +233,9 @@ public function Version($id) {
      * Gets the brush name
      * @return {string} Name of the file used for the syntax highlighter brush
      */
-    public function getBrushName() {
-        switch(strtolower($this->Language()->Name)) {
+    public function getBrushName()
+    {
+        switch (strtolower($this->Language()->Name)) {
             case 'applescript':return 'shBrushAppleScript';
             case 'actionscript3':
             case 'as3':return 'shBrushAS3';
@@ -281,7 +297,8 @@ public function getBrushName() {
      * Gets the highlight code used for syntax highlighter
      * @return {string} Language code
      */
-    public function getHighlightCode() {
+    public function getHighlightCode()
+    {
         return strtolower($this->Language()->HighlightCode);
     }
     
@@ -289,7 +306,8 @@ public function getHighlightCode() {
      * Gets the summary fields used in gridfield
      * @return {array} Array of field's mapped to labels
      */
-    public function summaryFields() {
+    public function summaryFields()
+    {
         return array(
                     'Language.Name'=>_t('Snippet.LANGUAGE', '_Language'),
                     'Title'=>_t('Snippet.TITLE', '_Title')
@@ -300,10 +318,11 @@ public function summaryFields() {
      * Returns two <span> html DOM elements, an empty <span> with the class 'jstree-pageicon' in front, following by a <span> wrapping around its Title.
      * @return string a html string ready to be directly used in a template
      */
-    public function getTreeTitle() {
+    public function getTreeTitle()
+    {
         $treeTitle = sprintf(
             "<span class=\"jstree-pageicon\"></span><span class=\"item\">%s</span>",
-            Convert::raw2xml(str_replace(array("\n","\r"),"",$this->Title))
+            Convert::raw2xml(str_replace(array("\n", "\r"), "", $this->Title))
         );
         
         return $treeTitle;
@@ -313,7 +332,8 @@ public function getTreeTitle() {
      * Workaround to get snippets to display
      * @return {bool} Returns boolean true
      */
-    public function hasSnippets() {
+    public function hasSnippets()
+    {
         return true;
     }
     
@@ -321,7 +341,8 @@ public function hasSnippets() {
      * Return the CSS classes to apply to this node in the CMS tree
      * @return {string} Classes used in the cms tree
      */
-    public function CMSTreeClasses() {
+    public function CMSTreeClasses()
+    {
         $classes=sprintf('class-%s', $this->class);
         
         $classes.=$this->markingClasses();
@@ -333,18 +354,19 @@ public function CMSTreeClasses() {
      * Returns an array of the class names of classes that are allowed to be children of this class.
      * @return {array} Array of children
      */
-    public function allowedChildren() {
+    public function allowedChildren()
+    {
         $allowedChildren = array();
         $candidates = $this->stat('allowed_children');
-        if($candidates && $candidates != "none") {
-            foreach($candidates as $candidate) {
+        if ($candidates && $candidates != "none") {
+            foreach ($candidates as $candidate) {
                 // If a classname is prefixed by "*", such as "*Page", then only that
                 // class is allowed - no subclasses. Otherwise, the class and all its subclasses are allowed.
-                if(substr($candidate,0,1) == '*') {
-                    $allowedChildren[] = substr($candidate,1);
+                if (substr($candidate, 0, 1) == '*') {
+                    $allowedChildren[] = substr($candidate, 1);
                 } else {
                     $subclasses = ClassInfo::subclassesFor($candidate);
-                    foreach($subclasses as $subclass) {
+                    foreach ($subclasses as $subclass) {
                         $allowedChildren[] = $subclass;
                     }
                 }
@@ -358,8 +380,8 @@ public function allowedChildren() {
      * Returns the default child for this class
      * @return {string} Class name of the default child
      */
-    public function default_child() {
+    public function default_child()
+    {
         return $this->stat('default_child');
     }
 }
-?>
\ No newline at end of file
diff --git a/code/model/SnippetFolder.php b/code/model/SnippetFolder.php
index c8fa84e..9f7e01a 100644
--- a/code/model/SnippetFolder.php
+++ b/code/model/SnippetFolder.php
@@ -1,5 +1,6 @@
 <?php
-class SnippetFolder extends DataObject {
+class SnippetFolder extends DataObject
+{
     private static $db=array(
                             'Name'=>'Varchar(150)'
                          );
@@ -34,8 +35,9 @@ class SnippetFolder extends DataObject {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can view false otherwise
      */
-    public function canView($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canView($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -47,8 +49,9 @@ public function canView($member=null) {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can edit false otherwise
      */
-    public function canEdit($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canEdit($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -60,8 +63,9 @@ public function canEdit($member=null) {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can delete false otherwise
      */
-    public function canDelete($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canDelete($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -73,8 +77,9 @@ public function canDelete($member=null) {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can create false otherwise
      */
-    public function canCreate($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canCreate($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -86,7 +91,8 @@ public function canCreate($member=null) {
      * Gets fields used in the cms
      * @return {FieldList} Fields to be used
      */
-    public function getCMSFields() {
+    public function getCMSFields()
+    {
         return new FieldList(
                             new TextField('Name', _t('SnippetFolder.NAME', '_Name'), null, 150)
                         );
@@ -96,7 +102,8 @@ public function getCMSFields() {
      * Determins if the folder has snippets
      * return {bool} Returns true so that folders always show
      */
-    public function hasSnippets() {
+    public function hasSnippets()
+    {
         return true;
     }
     
@@ -104,10 +111,11 @@ public function hasSnippets() {
      * Returns two <span> html DOM elements, an empty <span> with the class 'jstree-pageicon' in front, following by a <span> wrapping around its Title.
      * @return {string} a html string ready to be directly used in a template
      */
-    public function getTreeTitle() {
+    public function getTreeTitle()
+    {
         $treeTitle = sprintf(
             "<span class=\"jstree-pageicon\"></span><span class=\"item\">%s</span>",
-            Convert::raw2xml(str_replace(array("\n","\r"),"",$this->Title))
+            Convert::raw2xml(str_replace(array("\n", "\r"), "", $this->Title))
         );
         
         return $treeTitle;
@@ -117,7 +125,8 @@ public function getTreeTitle() {
      * Return the CSS classes to apply to this node in the CMS tree
      * @return {string} Classes used in the cms tree
      */
-    public function CMSTreeClasses() {
+    public function CMSTreeClasses()
+    {
         $classes=sprintf('class-%s', $this->class);
         
         $classes.=$this->markingClasses();
@@ -128,7 +137,8 @@ public function CMSTreeClasses() {
     /**
      * Removes all snippets from the folder before deleting
      */
-    protected function onBeforeDelete() {
+    protected function onBeforeDelete()
+    {
         parent::onBeforeDelete();
         
         //Remove all Snippets from this folder
@@ -142,18 +152,19 @@ protected function onBeforeDelete() {
      * Returns an array of the class names of classes that are allowed to be children of this class.
      * @return {array} Array of children
      */
-    public function allowedChildren() {
+    public function allowedChildren()
+    {
         $allowedChildren = array();
         $candidates = $this->stat('allowed_children');
-        if($candidates && $candidates != "none") {
-            foreach($candidates as $candidate) {
+        if ($candidates && $candidates != "none") {
+            foreach ($candidates as $candidate) {
                 // If a classname is prefixed by "*", such as "*Page", then only that
                 // class is allowed - no subclasses. Otherwise, the class and all its subclasses are allowed.
-                if(substr($candidate,0,1) == '*') {
-                    $allowedChildren[] = substr($candidate,1);
+                if (substr($candidate, 0, 1) == '*') {
+                    $allowedChildren[] = substr($candidate, 1);
                 } else {
                     $subclasses = ClassInfo::subclassesFor($candidate);
-                    foreach($subclasses as $subclass) {
+                    foreach ($subclasses as $subclass) {
                         $allowedChildren[] = $subclass;
                     }
                 }
@@ -167,8 +178,8 @@ public function allowedChildren() {
      * Returns the default child for this class
      * @return {string} Class name of the default child
      */
-    public function default_child() {
+    public function default_child()
+    {
         return $this->stat('default_child');
     }
 }
-?>
\ No newline at end of file
diff --git a/code/model/SnippetLanguage.php b/code/model/SnippetLanguage.php
index e06d1b0..349af3f 100644
--- a/code/model/SnippetLanguage.php
+++ b/code/model/SnippetLanguage.php
@@ -1,5 +1,6 @@
 <?php
-class SnippetLanguage extends DataObject {
+class SnippetLanguage extends DataObject
+{
     private static $db=array(
                             'Name'=>'Varchar(100)',
                             'FileExtension'=>'Varchar(45)',
@@ -98,8 +99,9 @@ class SnippetLanguage extends DataObject {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can view false otherwise
      */
-    public function canView($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canView($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -109,7 +111,8 @@ public function canView($member=null) {
     /**
      * Adds the default languages if they are missing
      */
-    public function requireDefaultRecords() {
+    public function requireDefaultRecords()
+    {
         parent::requireDefaultRecords();
         
         $defaultLangs=array_keys($this->defaultLanguages);
@@ -117,9 +120,9 @@ public function requireDefaultRecords() {
                                         ->filter('Name', $defaultLangs)
                                         ->filter('UserLanguage', 0)
                                         ->Count();
-        if($dbLangCount<count($defaultLangs)) {
-            foreach($this->defaultLanguages as $name=>$data) {
-                if(!SnippetLanguage::get()->find('Name', $name)) {
+        if ($dbLangCount<count($defaultLangs)) {
+            foreach ($this->defaultLanguages as $name=>$data) {
+                if (!SnippetLanguage::get()->find('Name', $name)) {
                     $lang=new SnippetLanguage();
                     $lang->Name=$name;
                     $lang->FileExtension=$data['Extension'];
@@ -135,10 +138,10 @@ public function requireDefaultRecords() {
         
         //Look for config languages
         $configLanguages=CodeBank::config()->extra_languages;
-        if(!empty($configLanguages)) {
-            foreach($configLanguages as $language) {
+        if (!empty($configLanguages)) {
+            foreach ($configLanguages as $language) {
                 //Validate languages
-                if(empty($language['Name']) || empty($language['FileName']) || empty($language['HighlightCode']) || empty($language['Brush'])) {
+                if (empty($language['Name']) || empty($language['FileName']) || empty($language['HighlightCode']) || empty($language['Brush'])) {
                     user_error('Invalid snippet user language found in config, user languages defined in config must contain a Name, FileName, HighlightCode and Brush file path', E_USER_WARNING);
                     continue;
                 }
@@ -150,13 +153,13 @@ public function requireDefaultRecords() {
                                             ->filter('UserLanguage', true)
                                             ->first();
                 
-                if(empty($lang) || $lang===false || $lang->ID<=0) {
-                    if(Director::is_absolute($language['Brush']) || Director::is_absolute_url($language['Brush'])) {
+                if (empty($lang) || $lang===false || $lang->ID<=0) {
+                    if (Director::is_absolute($language['Brush']) || Director::is_absolute_url($language['Brush'])) {
                         user_error('Invalid snippet user language found in config, user languages defined in config must contain a path to the brush relative to the SilverStripe base ('.Director::baseFolder().')', E_USER_WARNING);
                         continue;
                     }
                     
-                    if(preg_match('/\.js$/', $language['Brush'])==0) {
+                    if (preg_match('/\.js$/', $language['Brush'])==0) {
                         user_error('Invalid snippet user language found in config, user languages defined in config must be javascript files', E_USER_WARNING);
                         continue;
                     }
@@ -182,14 +185,15 @@ public function requireDefaultRecords() {
      * @param {Member} $member Member instance or member id to check
      * @return {bool} Returns boolean true or false depending if the user can delete this object
      */
-    public function canDelete($member=null) {
+    public function canDelete($member=null)
+    {
         $parentResult=parent::canDelete($member);
         
-        if($parentResult==false || $this->UserLanguage==false) {
+        if ($parentResult==false || $this->UserLanguage==false) {
             return false;
         }
         
-        if($this->Folders()->count()>0 || $this->Snippets()->count()>0) {
+        if ($this->Folders()->count()>0 || $this->Snippets()->count()>0) {
             return false;
         }
         
@@ -200,14 +204,15 @@ public function canDelete($member=null) {
      * Gets fields used in the cms
      * @return {FieldSet} Fields to be used
      */
-    public function getCMSFields() {
+    public function getCMSFields()
+    {
         $fields=new FieldList(
                             new TextField('Name', _t('SnippetLanguage.NAME', '_Name'), null, 100),
                             new TextField('FileExtension', _t('SnippetLanguage.FILE_EXTENSION', '_File Extension'), null, 45),
                             new CheckboxField('Hidden', _t('SnippetLanguage.HIDDEN', '_Hidden'))
                         );
         
-        if($this->UserLanguage==false) {
+        if ($this->UserLanguage==false) {
             $fields->replaceField('Name', $fields->dataFieldByName('Name')->performReadonlyTransformation());
             $fields->replaceField('FileExtension', $fields->dataFieldByName('FileExtension')->performReadonlyTransformation());
         }
@@ -215,7 +220,8 @@ public function getCMSFields() {
         return $fields;
     }
     
-    public function Folders() {
+    public function Folders()
+    {
         return $this->getComponents('Folders')->filter('ParentID', 0);
     }
     
@@ -223,7 +229,8 @@ public function Folders() {
      * Determins if the language has snippets
      * return {bool} Counts how many children snippets there are if there are more than 0 returns true, false otherwise
      */
-    public function hasSnippets() {
+    public function hasSnippets()
+    {
         return ($this->Snippets()->Count()>0);
     }
     
@@ -231,10 +238,11 @@ public function hasSnippets() {
      * Returns two <span> html DOM elements, an empty <span> with the class 'jstree-pageicon' in front, following by a <span> wrapping around its Title.
      * @return {string} a html string ready to be directly used in a template
      */
-    public function getTreeTitle() {
+    public function getTreeTitle()
+    {
         $treeTitle = sprintf(
             "<span class=\"jstree-pageicon\"></span><span class=\"item\">%s</span>",
-            Convert::raw2xml(str_replace(array("\n","\r"),"",$this->Title))
+            Convert::raw2xml(str_replace(array("\n", "\r"), "", $this->Title))
         );
         
         return $treeTitle;
@@ -244,7 +252,8 @@ public function getTreeTitle() {
      * Return the CSS classes to apply to this node in the CMS tree
      * @return {string} Classes used in the cms tree
      */
-    public function CMSTreeClasses() {
+    public function CMSTreeClasses()
+    {
         $classes=sprintf('class-%s', $this->class);
         
         $classes.=$this->markingClasses();
@@ -252,7 +261,8 @@ public function CMSTreeClasses() {
         return $classes;
     }
     
-    public function summaryFields() {
+    public function summaryFields()
+    {
         return array(
                     'Name'=>_t('SnippetLanguage.NAME', '_Name'),
                     'UserLanguage'=>_t('SnippetLanguage.USER_LANGUAGE', '_User Language'),
@@ -264,18 +274,19 @@ public function summaryFields() {
      * Returns an array of the class names of classes that are allowed to be children of this class.
      * @return {array} Array of children
      */
-    public function allowedChildren() {
+    public function allowedChildren()
+    {
         $allowedChildren = array();
         $candidates = $this->stat('allowed_children');
-        if($candidates && $candidates != "none") {
-            foreach($candidates as $candidate) {
+        if ($candidates && $candidates != "none") {
+            foreach ($candidates as $candidate) {
                 // If a classname is prefixed by "*", such as "*Page", then only that
                 // class is allowed - no subclasses. Otherwise, the class and all its subclasses are allowed.
-                if(substr($candidate,0,1) == '*') {
-                    $allowedChildren[] = substr($candidate,1);
+                if (substr($candidate, 0, 1) == '*') {
+                    $allowedChildren[] = substr($candidate, 1);
                 } else {
                     $subclasses = ClassInfo::subclassesFor($candidate);
-                    foreach($subclasses as $subclass) {
+                    foreach ($subclasses as $subclass) {
                         $allowedChildren[] = $subclass;
                     }
                 }
@@ -289,8 +300,8 @@ public function allowedChildren() {
      * Returns the default child for this class
      * @return {string} Class name of the default child
      */
-    public function default_child() {
+    public function default_child()
+    {
         return $this->stat('default_child');
     }
 }
-?>
\ No newline at end of file
diff --git a/code/model/SnippetPackage.php b/code/model/SnippetPackage.php
index 7bb72ea..9afd860 100644
--- a/code/model/SnippetPackage.php
+++ b/code/model/SnippetPackage.php
@@ -1,5 +1,6 @@
 <?php
-class SnippetPackage extends DataObject {
+class SnippetPackage extends DataObject
+{
     private static $db=array(
                             'Title'=>'Varchar(300)'
                          );
@@ -16,8 +17,9 @@ class SnippetPackage extends DataObject {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can view false otherwise
      */
-    public function canView($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canView($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -29,8 +31,9 @@ public function canView($member=null) {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can edit false otherwise
      */
-    public function canEdit($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canEdit($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -42,8 +45,9 @@ public function canEdit($member=null) {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can delete false otherwise
      */
-    public function canDelete($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canDelete($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -55,8 +59,9 @@ public function canDelete($member=null) {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can create false otherwise
      */
-    public function canCreate($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canCreate($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -67,7 +72,8 @@ public function canCreate($member=null) {
      * Gets fields used in the cms
      * @return {FieldList} Fields to be used
      */
-    public function getCMSFields() {
+    public function getCMSFields()
+    {
         $fields=new FieldList(
                             new TabSet('Root',
                                             new Tab('Main', _t('SnippetPackage.MAIN', '_Main'),
@@ -77,9 +83,9 @@ public function getCMSFields() {
                             new HiddenField('ID', 'ID')
                         );
         
-        if($this->ID==0) {
+        if ($this->ID==0) {
             $fields->addFieldToTab('Root.Main', new LabelField('Snippets', _t('SnippetPackage.SNIPPETS_AFTER_FIRST_SAVE', '_Snippets can be added after saving for the first time')));
-        }else {
+        } else {
             $packageGrid=new GridField('Snippets', _t('SnippetPackage.PACKAGE_SNIPPETS', '_Package Snippets'), $this->Snippets(), GridFieldConfig_RelationEditor::create(10));
             $packageGrid->getConfig()->removeComponentsByType('GridFieldEditButton')
                                     ->removeComponentsByType('GridFieldAddNewButton')
@@ -98,7 +104,8 @@ public function getCMSFields() {
      * Gets validator used in the cms
      * @return {RequiredFields} Required fields validator
      */
-    public function getCMSValidator() {
+    public function getCMSValidator()
+    {
         return new RequiredFields(
                                 'Title'
                             );
@@ -108,7 +115,8 @@ public function getCMSValidator() {
      * Return the CSS classes to apply to this node in the CMS tree
      * @return {string} Classes used in the cms tree
      */
-    public function CMSTreeClasses() {
+    public function CMSTreeClasses()
+    {
         $classes=sprintf('class-%s', $this->class);
         
         $classes.=$this->markingClasses();
@@ -120,10 +128,11 @@ public function CMSTreeClasses() {
      * Returns two <span> html DOM elements, an empty <span> with the class 'jstree-pageicon' in front, following by a <span> wrapping around its Title.
      * @return string a html string ready to be directly used in a template
      */
-    public function getTreeTitle() {
+    public function getTreeTitle()
+    {
         $treeTitle = sprintf(
             "<span class=\"jstree-pageicon\"></span><span class=\"item\">%s</span>",
-            Convert::raw2xml(str_replace(array("\n","\r"),"",$this->Title))
+            Convert::raw2xml(str_replace(array("\n", "\r"), "", $this->Title))
         );
         
         return $treeTitle;
@@ -133,15 +142,16 @@ public function getTreeTitle() {
      * Always return true
      * @return {bool} Return true
      */
-    public function hasSnippets() {
+    public function hasSnippets()
+    {
         return true;
     }
     
-    public function summaryFields() {
+    public function summaryFields()
+    {
         return array(
                     'Title'=>_t('SnippetPackage.TITLE', '_Title'),
                     'Snippets.Count'=>_t('SnippetPackage.PACKAGE_SNIPPETS', '_Package Snippets')
                 );
     }
 }
-?>
\ No newline at end of file
diff --git a/code/model/SnippetVersion.php b/code/model/SnippetVersion.php
index 71ea504..3d3c92d 100644
--- a/code/model/SnippetVersion.php
+++ b/code/model/SnippetVersion.php
@@ -1,5 +1,6 @@
 <?php
-class SnippetVersion extends DataObject {
+class SnippetVersion extends DataObject
+{
     private static $db=array(
                             'Text'=>'Text'
                          );
@@ -16,8 +17,9 @@ class SnippetVersion extends DataObject {
      * @param {int|Member} $member Member ID or instance to check
      * @return {bool} Returns boolean true if the member can view false otherwise
      */
-    public function canView($member=null) {
-        if(Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
+    public function canView($member=null)
+    {
+        if (Permission::check('CODE_BANK_ACCESS', 'any', $member)) {
             return true;
         }
         
@@ -29,7 +31,8 @@ public function canView($member=null) {
      * @param {Member} $member Member instance or member id to check
      * @return {bool} Returns boolean true or false depending if the user can create this object
      */
-    public function canCreate($member=null) {
+    public function canCreate($member=null)
+    {
         return false;
     }
     
@@ -38,7 +41,8 @@ public function canCreate($member=null) {
      * @param {Member} $member Member instance or member id to check
      * @return {bool} Returns boolean true or false depending if the user can edit this object
      */
-    public function canEdit($member=null) {
+    public function canEdit($member=null)
+    {
         return false;
     }
     
@@ -47,8 +51,8 @@ public function canEdit($member=null) {
      * @param {Member} $member Member instance or member id to check
      * @return {bool} Returns boolean true or false depending if the user can delete this object
      */
-    public function canDelete($member=null) {
+    public function canDelete($member=null)
+    {
         return false;
     }
 }
-?>
\ No newline at end of file
diff --git a/code/search/DefaultCodeBankSearchEngine.php b/code/search/DefaultCodeBankSearchEngine.php
index 71f90c9..606e29d 100644
--- a/code/search/DefaultCodeBankSearchEngine.php
+++ b/code/search/DefaultCodeBankSearchEngine.php
@@ -1,9 +1,11 @@
 <?php
-class DefaultCodeBankSearchEngine implements ICodeBankSearchEngine {
+class DefaultCodeBankSearchEngine implements ICodeBankSearchEngine
+{
     /**
-	 * Allows for hooking in to modify the table of the snippet class for the search engine
-	 */
-    public static function requireTable() {
+     * Allows for hooking in to modify the table of the snippet class for the search engine
+     */
+    public static function requireTable()
+    {
         //Add fulltext searchable extension
         Snippet::add_extension("FulltextSearchable('Title,Description,Tags')");
         
@@ -19,24 +21,25 @@ public static function requireTable() {
      * @param {int} $folderID Folder to filter to
      * @return {DataList} Data list pointing to the snippets in the results
      */
-    public function doSnippetSearch($keywords, $languageID=false, $folderID=false) {
+    public function doSnippetSearch($keywords, $languageID=false, $folderID=false)
+    {
         $list=Snippet::get();
         
-        if(isset($languageID) && !empty($languageID)) {
+        if (isset($languageID) && !empty($languageID)) {
             $list=$list->filter('LanguageID', intval($languageID));
         }
         
         
-        if(isset($folderID) && !empty($folderID)) {
+        if (isset($folderID) && !empty($folderID)) {
             $list=$list->filter('FolderID', intval($folderID));
         }
         
         
-        if(isset($keywords) && !empty($keywords)) {
+        if (isset($keywords) && !empty($keywords)) {
             $SQL_val=Convert::raw2sql($keywords);
-            if(DB::getConn() instanceof MySQLDatabase) {
+            if (DB::getConn() instanceof MySQLDatabase) {
                 $list=$list->where("MATCH(\"Title\", \"Description\", \"Tags\") AGAINST('".$SQL_val."' IN BOOLEAN MODE)");
-            }else {
+            } else {
                 $list=$list->filterAny(array(
                                         'Title:PartialMatch'=>$SQL_val,
                                         'Description:PartialMatch'=>$SQL_val,
@@ -48,4 +51,3 @@ public function doSnippetSearch($keywords, $languageID=false, $folderID=false) {
         return $list;
     }
 }
-?>
\ No newline at end of file
diff --git a/code/search/ICodeBankSearchEngine.php b/code/search/ICodeBankSearchEngine.php
index 80ba72f..47541a5 100644
--- a/code/search/ICodeBankSearchEngine.php
+++ b/code/search/ICodeBankSearchEngine.php
@@ -1,5 +1,6 @@
 <?php
-interface ICodeBankSearchEngine {
+interface ICodeBankSearchEngine
+{
     /**
      * Allows for hooking in to modify the table of the snippet class for the search engine
      */
@@ -14,4 +15,3 @@ public static function requireTable();
      */
     public function doSnippetSearch($keywords, $languageID=false, $folderID=false);
 }
-?>
\ No newline at end of file
diff --git a/code/search/SolrCodeBankSearchEngine.php b/code/search/SolrCodeBankSearchEngine.php
index ecdf117..f5209dc 100644
--- a/code/search/SolrCodeBankSearchEngine.php
+++ b/code/search/SolrCodeBankSearchEngine.php
@@ -1,9 +1,12 @@
 <?php
-class SolrCodeBankSearchEngine implements ICodeBankSearchEngine {
+class SolrCodeBankSearchEngine implements ICodeBankSearchEngine
+{
     /**
      * Allows for hooking in to modify the table of the snippet class for the search engine
      */
-    public static function requireTable() {}
+    public static function requireTable()
+    {
+    }
     
     /**
      * Performs the search against the snippets in the system
@@ -13,7 +16,8 @@ public static function requireTable() {}
      * @param {int} $folderID Folder to filter to
      * @return {DataList} Data list pointing to the snippets in the results
      */
-    public function doSnippetSearch($keywords, $languageID=false, $folderID=false) {
+    public function doSnippetSearch($keywords, $languageID=false, $folderID=false)
+    {
         $searchIndex=singleton('CodeBankSolrIndex');
         $searchQuery=new SearchQuery();
         $searchQuery->classes=array(
@@ -24,12 +28,12 @@ public function doSnippetSearch($keywords, $languageID=false, $folderID=false) {
                                 );
         
         //Add language filtering
-        if($languageID!==false && $languageID>0) {
+        if ($languageID!==false && $languageID>0) {
             $searchQuery->filter('Snippet_LanguageID', $languageID);
         }
         
         //Add language filtering
-        if($folderID!==false && $folderID>0) {
+        if ($folderID!==false && $folderID>0) {
             $searchQuery->filter('Snippet_FolderID', $folderID);
         }
         
@@ -43,8 +47,10 @@ public function doSnippetSearch($keywords, $languageID=false, $folderID=false) {
     }
 }
 
-class CodeBankSolrIndex extends SolrIndex {
-    public function init() {
+class CodeBankSolrIndex extends SolrIndex
+{
+    public function init()
+    {
         //Add the snippet class
         $this->addClass('Snippet');
         
@@ -58,4 +64,3 @@ public function init() {
         $this->addFilterField('FolderID');
     }
 }
-?>
\ No newline at end of file
diff --git a/code/shortcodes/CodeBankShortCode.php b/code/shortcodes/CodeBankShortCode.php
index e6f30a0..4d20137 100644
--- a/code/shortcodes/CodeBankShortCode.php
+++ b/code/shortcodes/CodeBankShortCode.php
@@ -1,119 +1,121 @@
-<?php
-class CodeBankShortCode {
-    /**
-     * Parses the snippet short code
-     * @example [snippet id=123]
-     * @example [snippet id=123 version=456]
-     */
-    public static function parse($arguments, $content=null, $parser=null) {
-        //Ensure ID is pressent in the arguments
-        if(!array_key_exists('id', $arguments)) {
-            return '<p><b><i>'._t('CodeBankShortCode.MISSING_ID_ATTRIBUTE', '_Short Code missing the id attribute').'</i></b></p>';
-        }
-        
-        
-        //Fetch Snippet
-        $snippet=Snippet::get()->byID(intval($arguments['id']));
-        if(empty($snippet) || $snippet===false || $snippet->ID==0) {
-            return '<p><b><i>'._t('CodeBankShortCode.SNIPPET_NOT_FOUND', '_Snippet not found').'</i></b></p>';
-        }
-        
-        
-        //Fetch Text
-        $snippetText=$snippet->SnippetText;
-        
-        
-        //If the version exists fetch it, and replace the text with that of the version
-        if(array_key_exists('version', $arguments)) {
-            $version=$snippet->Version(intval($arguments['version']));
-            if(empty($version) || $version===false || $version->ID==0) {
-                $snippetText=$version->Text;
-            }
-        }
-        
-        
-        //Load CSS Requirements
-        Requirements::css(CB_DIR.'/javascript/external/syntaxhighlighter/themes/shCore.css');
-        Requirements::css(CB_DIR.'/javascript/external/syntaxhighlighter/themes/shCoreDefault.css');
-        Requirements::css(CB_DIR.'/javascript/external/syntaxhighlighter/themes/shThemeDefault.css');
-        
-        //Load JS Requirements
-        Requirements::javascript(THIRDPARTY_DIR.'/jquery/jquery.js');
-        Requirements::javascript(CB_DIR.'/javascript/external/syntaxhighlighter/brushes/shCore.js');
-        Requirements::javascript(CB_DIR.'/javascript/external/syntaxhighlighter/brushes/'.self::getBrushName($snippet->Language()->HighlightCode).'.js');
-        Requirements::javascriptTemplate(CB_DIR.'/javascript/CodeBankShortCode.template.js', array('ID'=>$snippet->ID), 'snippet-highlightinit-'.$snippet->ID);
-        
-        
-        //Render the snippet
-        $obj=new ViewableData();
-        return $obj->renderWith('CodeBankShortCode', array(
-                                                            'ID'=>$snippet->ID,
-                                                            'Title'=>$snippet->getField('Title'),
-                                                            'Description'=>$snippet->getField('Description'),
-                                                            'SnippetText'=>DBField::create_field('Text', $snippetText),
-                                                            'HighlightCode'=>strtolower($snippet->Language()->HighlightCode)
-                                                        ));
-    }
-    
-    /**
-     * Gets the brush name
-     * @return {string} Name of the file used for the syntax highlighter brush
-     */
-    protected static function getBrushName($language) {
-        switch(strtolower($language)) {
-            case 'applescript':return 'shBrushAppleScript';
-            case 'actionscript3':
-            case 'as3':return 'shBrushAS3';
-            case 'mxml':
-            case 'flex':return 'shBrushFlex';
-            case 'bash':
-            case 'shell':return 'shBrushBash';
-            case 'coldfusion':
-            case 'cf':return 'shBrushColdFusion';
-            case 'cpp':
-            case 'c':return 'shBrushCpp';
-            case 'c#':
-            case 'c-sharp':
-            case 'csharp':return 'shBrushCSharp';
-            case 'css':return 'shBrushCss';
-            case 'delphi':
-            case 'pascal':return 'shBrushDelphi';
-            case 'diff':
-            case 'patch':
-            case 'pas':return 'shBrushDiff';
-            case 'erl':
-            case 'erlang':return 'shBrushErlang';
-            case 'groovy':return 'shBrushGroovy';
-            case 'java':return 'shBrushJava';
-            case 'jfx':
-            case 'javafx':return 'shBrushJavaFX';
-            case 'js':
-            case 'jscript':
-            case 'javascript':return 'shBrushJScript';
-            case 'perl':
-            case 'pl':return 'shBrushPerl';
-            case 'php':return 'shBrushPhp';
-            case 'text':
-            case 'plain':return 'shBrushPlain';
-            case 'py':
-            case 'python':return 'shBrushPython';
-            case 'ruby':
-            case 'rails':
-            case 'ror':
-            case 'rb':return 'shBrushRuby';
-            case 'sass':
-            case 'scss':return 'shBrushSass';
-            case 'scala':return 'shBrushScala';
-            case 'sql':return 'shBrushSql';
-            case 'vb':
-            case 'vbnet':return 'shBrushVb';
-            case 'xml':
-            case 'xhtml':
-            case 'xslt':
-            case 'html':return 'shBrushXml';
-            case 'ss':
-            case 'silverstripe':return 'shBrushSilverStripe';
-        }
-    }
-}
-?>
\ No newline at end of file
+<?php
+class CodeBankShortCode
+{
+    /**
+     * Parses the snippet short code
+     * @example [snippet id=123]
+     * @example [snippet id=123 version=456]
+     */
+    public static function parse($arguments, $content=null, $parser=null)
+    {
+        //Ensure ID is pressent in the arguments
+        if (!array_key_exists('id', $arguments)) {
+            return '<p><b><i>'._t('CodeBankShortCode.MISSING_ID_ATTRIBUTE', '_Short Code missing the id attribute').'</i></b></p>';
+        }
+        
+        
+        //Fetch Snippet
+        $snippet=Snippet::get()->byID(intval($arguments['id']));
+        if (empty($snippet) || $snippet===false || $snippet->ID==0) {
+            return '<p><b><i>'._t('CodeBankShortCode.SNIPPET_NOT_FOUND', '_Snippet not found').'</i></b></p>';
+        }
+        
+        
+        //Fetch Text
+        $snippetText=$snippet->SnippetText;
+        
+        
+        //If the version exists fetch it, and replace the text with that of the version
+        if (array_key_exists('version', $arguments)) {
+            $version=$snippet->Version(intval($arguments['version']));
+            if (empty($version) || $version===false || $version->ID==0) {
+                $snippetText=$version->Text;
+            }
+        }
+        
+        
+        //Load CSS Requirements
+        Requirements::css(CB_DIR.'/javascript/external/syntaxhighlighter/themes/shCore.css');
+        Requirements::css(CB_DIR.'/javascript/external/syntaxhighlighter/themes/shCoreDefault.css');
+        Requirements::css(CB_DIR.'/javascript/external/syntaxhighlighter/themes/shThemeDefault.css');
+        
+        //Load JS Requirements
+        Requirements::javascript(THIRDPARTY_DIR.'/jquery/jquery.js');
+        Requirements::javascript(CB_DIR.'/javascript/external/syntaxhighlighter/brushes/shCore.js');
+        Requirements::javascript(CB_DIR.'/javascript/external/syntaxhighlighter/brushes/'.self::getBrushName($snippet->Language()->HighlightCode).'.js');
+        Requirements::javascriptTemplate(CB_DIR.'/javascript/CodeBankShortCode.template.js', array('ID'=>$snippet->ID), 'snippet-highlightinit-'.$snippet->ID);
+        
+        
+        //Render the snippet
+        $obj=new ViewableData();
+        return $obj->renderWith('CodeBankShortCode', array(
+                                                            'ID'=>$snippet->ID,
+                                                            'Title'=>$snippet->getField('Title'),
+                                                            'Description'=>$snippet->getField('Description'),
+                                                            'SnippetText'=>DBField::create_field('Text', $snippetText),
+                                                            'HighlightCode'=>strtolower($snippet->Language()->HighlightCode)
+                                                        ));
+    }
+    
+    /**
+     * Gets the brush name
+     * @return {string} Name of the file used for the syntax highlighter brush
+     */
+    protected static function getBrushName($language)
+    {
+        switch (strtolower($language)) {
+            case 'applescript':return 'shBrushAppleScript';
+            case 'actionscript3':
+            case 'as3':return 'shBrushAS3';
+            case 'mxml':
+            case 'flex':return 'shBrushFlex';
+            case 'bash':
+            case 'shell':return 'shBrushBash';
+            case 'coldfusion':
+            case 'cf':return 'shBrushColdFusion';
+            case 'cpp':
+            case 'c':return 'shBrushCpp';
+            case 'c#':
+            case 'c-sharp':
+            case 'csharp':return 'shBrushCSharp';
+            case 'css':return 'shBrushCss';
+            case 'delphi':
+            case 'pascal':return 'shBrushDelphi';
+            case 'diff':
+            case 'patch':
+            case 'pas':return 'shBrushDiff';
+            case 'erl':
+            case 'erlang':return 'shBrushErlang';
+            case 'groovy':return 'shBrushGroovy';
+            case 'java':return 'shBrushJava';
+            case 'jfx':
+            case 'javafx':return 'shBrushJavaFX';
+            case 'js':
+            case 'jscript':
+            case 'javascript':return 'shBrushJScript';
+            case 'perl':
+            case 'pl':return 'shBrushPerl';
+            case 'php':return 'shBrushPhp';
+            case 'text':
+            case 'plain':return 'shBrushPlain';
+            case 'py':
+            case 'python':return 'shBrushPython';
+            case 'ruby':
+            case 'rails':
+            case 'ror':
+            case 'rb':return 'shBrushRuby';
+            case 'sass':
+            case 'scss':return 'shBrushSass';
+            case 'scala':return 'shBrushScala';
+            case 'sql':return 'shBrushSql';
+            case 'vb':
+            case 'vbnet':return 'shBrushVb';
+            case 'xml':
+            case 'xhtml':
+            case 'xslt':
+            case 'html':return 'shBrushXml';
+            case 'ss':
+            case 'silverstripe':return 'shBrushSilverStripe';
+        }
+    }
+}
diff --git a/code/tasks/CodeBankLegacyMigrate.php b/code/tasks/CodeBankLegacyMigrate.php
index fafc381..1dbcf01 100644
--- a/code/tasks/CodeBankLegacyMigrate.php
+++ b/code/tasks/CodeBankLegacyMigrate.php
@@ -1,5 +1,6 @@
 <?php
-class CodeBankLegacyMigrate extends BuildTask {
+class CodeBankLegacyMigrate extends BuildTask
+{
     /**
      * @var {string}
      */
@@ -13,17 +14,18 @@ class CodeBankLegacyMigrate extends BuildTask {
     /**
      * Performs the migration
      */
-    public function run($request) {
+    public function run($request)
+    {
         //Check for tables
         $tables=DB::tableList();
-        if(!array_key_exists('languages', $tables) || !array_key_exists('snippits', $tables) || !array_key_exists('snippit_history', $tables) || !array_key_exists('preferences', $tables) || !array_key_exists('settings', $tables) || !array_key_exists('snippit_search', $tables) || !array_key_exists('users', $tables)) {
+        if (!array_key_exists('languages', $tables) || !array_key_exists('snippits', $tables) || !array_key_exists('snippit_history', $tables) || !array_key_exists('preferences', $tables) || !array_key_exists('settings', $tables) || !array_key_exists('snippit_search', $tables) || !array_key_exists('users', $tables)) {
             echo '<b>'._t('CodeBankLegacyMigrate.TABLES_NOT_FOUND', '_Could not find Code Bank 2.2 database tables, cannot migrate').'</b>';
             exit;
         }
         
         
         //Ensure Empty
-        if(Snippet::get()->Count()>0) {
+        if (Snippet::get()->Count()>0) {
             echo '<b>'._t('CodeBankLegacyMigrate.SNIPPETS_PRESENT', '_Already appears to be snippets present in the database, please start with a clean database, cannot migrate.').'</b>';
             exit;
         }
@@ -35,19 +37,19 @@ public function run($request) {
         
         //Find Other language
         $plainTextID=SnippetLanguage::get()->filter('Name', 'Other')->first();
-        if(empty($plainTextID) || $plainTextID==false || $plainTextID->ID==0) {
+        if (empty($plainTextID) || $plainTextID==false || $plainTextID->ID==0) {
             echo _t('CodeBankLegacyMigrate.OTHER_NOT_FOUND', '_Could not find the Other Language, cannot migrate, please run dev/build first');
             exit;
-        }else {
+        } else {
             $plainTextID=$plainTextID->ID;
         }
         
         
         //Check for users group
         $usersGroup=Group::get()->filter('Code', 'code-bank-api')->first();
-        if(empty($usersGroup) || $usersGroup==false || $usersGroup->ID==0) {
+        if (empty($usersGroup) || $usersGroup==false || $usersGroup->ID==0) {
             //Rollback Transaction
-            if(DB::getConn()->supportsTransactions()) {
+            if (DB::getConn()->supportsTransactions()) {
                 DB::getConn()->transactionRollback();
             }
             
@@ -57,7 +59,7 @@ public function run($request) {
         
         
         //Start Transaction
-        if(DB::getConn()->supportsTransactions()) {
+        if (DB::getConn()->supportsTransactions()) {
             DB::getConn()->transactionStart();
         }
         
@@ -65,14 +67,14 @@ public function run($request) {
         //Migrate Languages
         echo '<b>'._t('CodeBankLegacyMigrate.MIGRATE_USER_LANGUAGES', '_Migrating User Languages').'</b>... ';
         $results=DB::query('SELECT * FROM "languages" WHERE "user_language"=1');
-        if($results->numRecords()>0) {
-            foreach($results as $row) {
+        if ($results->numRecords()>0) {
+            foreach ($results as $row) {
                 DB::query('INSERT INTO "SnippetLanguage" ("ClassName","Created", "LastEdited", "Name", "FileExtension", "HighlightCode", "UserLanguage") '.
                         "VALUES('SnippetLanguage','".date('Y-m-d H:i:s')."','".date('Y-m-d H:i:s')."','".Convert::raw2sql($row['language'])."','".Convert::raw2sql($row['file_extension'])."','".Convert::raw2sql($row['sjhs_code'])."',1)");
             }
             
             echo _t('CodeBankLegacyMigrate.DONE', '_Done').'<br/>';
-        }else {
+        } else {
             echo _t('CodeBankLegacyMigrate.NOT_FOUND', '_None Found').'<br/>';
         }
         
@@ -81,9 +83,9 @@ public function run($request) {
         echo '<b>'._t('CodeBankLegacyMigrate.MIGRATE_USERS', '_Migrating Users').'</b>...';
         
         $results=DB::query('SELECT * FROM "users"');
-        if($results->numRecords()>0) {
-            foreach($results as $row) {
-                if($row['deleted']==true) {
+        if ($results->numRecords()>0) {
+            foreach ($results as $row) {
+                if ($row['deleted']==true) {
                     echo '<br/><i>'._t('CodeBankLegacyMigrate.DELETED_MEMBER_SKIP', '_WARNING: Skipping deleted member {username}, deleted members in Code Bank 3 are not supported', array('username'=>$row['username'])).'</i><br/>';
                     continue;
                 }
@@ -94,7 +96,7 @@ public function run($request) {
                 
                 //Insert User
                 $member=Member::get()->filter('Email', Convert::raw2sql($row['username']))->first();
-                if(empty($member) || $member===false || $member->ID==0) {
+                if (empty($member) || $member===false || $member->ID==0) {
                     $member=new Member();
                     $member->FirstName=$row['username'];
                     $member->Email=$row['username'];
@@ -114,16 +116,16 @@ public function run($request) {
                     
                     
                     //Add to security group
-                    if($row['username']=='admin') {
+                    if ($row['username']=='admin') {
                         //For admin add to administrators group
                         $member->addToGroupByCode('administrators');
-                    }else {
+                    } else {
                         //For all others add to code-bank-api
                         $member->addToGroupByCode('code-bank-api');
                     }
-                }else {
+                } else {
                     //Add to code-bank-api if not admin
-                    if($row['username']!='admin') {
+                    if ($row['username']!='admin') {
                         $member->addToGroupByCode('code-bank-api');
                     }
                     
@@ -135,9 +137,9 @@ public function run($request) {
             }
             
             echo _t('CodeBankLegacyMigrate.DONE', '_Done').'<br/>';
-        }else {
+        } else {
             //Rollback Transaction
-            if(DB::getConn()->supportsTransactions()) {
+            if (DB::getConn()->supportsTransactions()) {
                 DB::getConn()->transactionRollback();
             }
             
@@ -162,31 +164,31 @@ public function run($request) {
                                 'INNER JOIN "languages" ON "snippits"."fkLanguage"="languages"."id" '.
                                 'LEFT JOIN "users" "creator" ON "snippits"."fkCreatorUser"="creator"."id" '.
                                 'LEFT JOIN "users" "lastEditor" ON "snippits"."fkLastEditUser"="lastEditor"."id"');
-        if($results->numRecords()>0) {
-            foreach($results as $row) {
+        if ($results->numRecords()>0) {
+            foreach ($results as $row) {
                 //Get Creator ID
                 $creator=Member::get()->filter('Email', Convert::raw2sql($row['creatorUsername']))->first();
-                if(!empty($creator) && $creator!==false && $creator->ID!=0) {
+                if (!empty($creator) && $creator!==false && $creator->ID!=0) {
                     $creatorID=$creator->ID;
-                }else {
+                } else {
                     $creatorID=0;
                 }
                 
                 
                 //Get Last Editor ID
                 $lastEditor=Member::get()->filter('Email', Convert::raw2sql($row['lastEditorUsername']))->first();
-                if(!empty($lastEditor) && $lastEditor!==false && $lastEditor->ID!=0) {
+                if (!empty($lastEditor) && $lastEditor!==false && $lastEditor->ID!=0) {
                     $lastEditorID=$lastEditor->ID;
-                }else {
+                } else {
                     $lastEditorID=0;
                 }
                 
                 
                 //Get Language ID
                 $language=SnippetLanguage::get()->filter('Name', Convert::raw2sql($row['language']))->first();
-                if(!empty($language) && $language!==false && $language->ID!=0) {
+                if (!empty($language) && $language!==false && $language->ID!=0) {
                     $languageID=$language->ID;
-                }else {
+                } else {
                     $languageID=$plainTextID;
                 }
                 
@@ -198,16 +200,15 @@ public function run($request) {
                 
                 //Get History
                 $versions=DB::query('SELECT * FROM "snippit_history" WHERE "fkSnippit"='.$row['id']);
-                foreach($versions as $version) {
+                foreach ($versions as $version) {
                     DB::query('INSERT INTO "SnippetVersion" ("ClassName", "Created", "LastEdited", "Text", "ParentID") '.
                             "VALUES('SnippetVersion','".date('Y-m-d H:i:s', strtotime($version['date']))."','".date('Y-m-d H:i:s', strtotime($version['date']))."','".Convert::raw2sql($version['text'])."',".$row['id'].")");
-                                
                 }
             }
             
             
             echo _t('CodeBankLegacyMigrate.DONE', '_Done').'<br/>';
-        }else {
+        } else {
             echo _t('CodeBankLegacyMigrate.NO_SNIPPETS_FOUND', '_No snippets found').'<br/>';
         }
         
@@ -222,7 +223,7 @@ public function run($request) {
         DB::getConn()->renameTable('users', '_obsolete_users');
         
         //Complete Transaction
-        if(DB::getConn()->supportsTransactions()) {
+        if (DB::getConn()->supportsTransactions()) {
             DB::getConn()->transactionEnd();
         }
         
@@ -238,7 +239,8 @@ public function run($request) {
      * Generates the title used for the task
      * @return {string} Title used for the build task
      */
-    public function getTitle() {
+    public function getTitle()
+    {
         return _t('CodeBankLegacyMigrate.TITLE', $this->title);
     }
     
@@ -246,8 +248,8 @@ public function getTitle() {
      * Generates the description used for the task
      * @return {string} Description used for the build task
      */
-    public function getDescription() {
+    public function getDescription()
+    {
         return _t('CodeBankLegacyMigrate.DESCRIPTION', $this->description);
     }
 }
-?>
\ No newline at end of file
diff --git a/tests/CodeBankAPITest.php b/tests/CodeBankAPITest.php
index 6d57c37..5efa25c 100644
--- a/tests/CodeBankAPITest.php
+++ b/tests/CodeBankAPITest.php
@@ -1,11 +1,13 @@
 <?php
-class CodeBankAPITest extends SapphireTest {
+class CodeBankAPITest extends SapphireTest
+{
     public static $fixture_file='SnippetTest.yml';
     
     /**
      * Forces the snippet languages to be populated on setup
      */
-    public function setUp() {
+    public function setUp()
+    {
         parent::setUp();
         
         //Populate default languages
@@ -18,7 +20,8 @@ public function setUp() {
     /**
      * Tests the api end point to ensure it is active and returning the correct response for a ping
      */
-    public function testAPIEndpoint() {
+    public function testAPIEndpoint()
+    {
         $response=$this->getAMFResponse('ServerController.connect');
         
         
@@ -29,7 +32,8 @@ public function testAPIEndpoint() {
     /**
      * Tests to see if the login method in the session manager actually login a user
      */
-    public function testLogin() {
+    public function testLogin()
+    {
         $response=$this->getAMFResponse('SessionManager.login', array('user'=>'admin', 'pass'=>'admin'));
         
         
@@ -44,7 +48,8 @@ public function testLogin() {
     /**
      * Test to see if the logout method in the session manager actually logs the user out
      */
-    public function testLogout() {
+    public function testLogout()
+    {
         //Login the admin user
         $this->objFromFixture('Member', 'admin')->login();
         
@@ -64,7 +69,8 @@ public function testLogout() {
     /**
      * Tests generic api access to see if user control is enforced correctly
      */
-    public function testAPIAccess() {
+    public function testAPIAccess()
+    {
         //Login the noaccess account
         $this->objFromFixture('Member', 'noaccess')->login();
         
@@ -92,7 +98,8 @@ public function testAPIAccess() {
     /**
      * Tests to see if a member can update their preferences
      */
-    public function testMemberSavePreferences() {
+    public function testMemberSavePreferences()
+    {
         $member=$this->objFromFixture('Member', 'apiuser');
         $member->login();
         
@@ -117,9 +124,10 @@ public function testMemberSavePreferences() {
     /**
      * Checks to see if a non-admin user can access admin specific sections
      */
-    public function testAdminPermissionFailure() {
+    public function testAdminPermissionFailure()
+    {
         $this->objFromFixture('Member', 'apiuser')->login(); //Login apiuser
-        
+
         
         //Try fetching users list with a user with just CODE_BANK_API permissions
         $response=$this->getAMFResponse('Administration.getUsersList');
@@ -131,7 +139,7 @@ public function testAdminPermissionFailure() {
         
         
         $this->objFromFixture('Member', 'admin')->login(); //Login admin user
-        
+
         //Try fetching users list with a user with ADMIN permissions
         $response=$this->getAMFResponse('Administration.getUsersList');
         
@@ -143,7 +151,8 @@ public function testAdminPermissionFailure() {
     /**
      * Tests to see if admin's can delete a user, also checks to see that a normal user cannot
      */
-    public function testAdminDeleteUser() {
+    public function testAdminDeleteUser()
+    {
         $this->objFromFixture('Member', 'apiuser')->login(); //Login apiuser
         $memberToDelete=Member::get()->filter('Email', 'noaccess')->first()->ID;
         
@@ -163,7 +172,7 @@ public function testAdminDeleteUser() {
         
         
         $this->objFromFixture('Member', 'admin')->login(); //Login admin user
-        
+
         //Try deleting with a user with ADMIN permissions
         $response=$this->getAMFResponse('Administration.deleteUser', array('id'=>$memberToDelete));
         
@@ -179,9 +188,10 @@ public function testAdminDeleteUser() {
     /**
      * Test the change password system, first checks to ensure that a user changing their password must provide the current password, then checks to see if an admin can change another user's password
      */
-    public function testChangePassword() {
+    public function testChangePassword()
+    {
         $this->objFromFixture('Member', 'admin')->login(); //Login admin
-        
+
         
         //Test incorrect current password
         $response=$this->getAMFResponse('Server.changePassword', array('currPassword'=>'nimda', 'password'=>'admin1'));
@@ -210,7 +220,7 @@ public function testChangePassword() {
         
         //Try changing another users pasword where they don't have admin permissions
         $this->objFromFixture('Member', 'apiuser')->login(); //Login non-admin
-        
+
         //Test chancing with the correct current password
         $response=$this->getAMFResponse('Administration.changeUserPassword', array('id'=>$this->objFromFixture('Member', 'noaccess')->ID, 'password'=>'admin1'));
         
@@ -222,9 +232,10 @@ public function testChangePassword() {
     /**
      * Tests to see if an admin can create a user, also checks to see if duplicate detection is functioning correctly
      */
-    public function testCreateUser() {
+    public function testCreateUser()
+    {
         $this->objFromFixture('Member', 'admin')->login(); //Login admin
-        
+
         
         //Test creating a user
         $response=$this->getAMFResponse('Administration.createUser', array(
@@ -256,9 +267,10 @@ public function testCreateUser() {
     /**
      * Tests to see if the language creation is working correctly
      */
-    public function testCreateLanguage() {
+    public function testCreateLanguage()
+    {
         $this->objFromFixture('Member', 'admin')->login(); //Login admin
-        
+
         
         //Test creating a language
         $response=$this->getAMFResponse('Administration.createLanguage', array(
@@ -286,9 +298,10 @@ public function testCreateLanguage() {
     /**
      * Tests to see if the language deletion is working correctly
      */
-    public function testDeleteLanguage() {
+    public function testDeleteLanguage()
+    {
         $this->objFromFixture('Member', 'admin')->login(); //Login admin
-        
+
         
         //Try deleting a default language
         $response=$this->getAMFResponse('Administration.deleteLanguage', array('id'=>SnippetLanguage::get()->filter('Name', 'PHP')->first()->ID));
@@ -335,9 +348,10 @@ public function testDeleteLanguage() {
     /**
      * Tests to see if the language editing is working correctly
      */
-    public function testEditLanguage() {
+    public function testEditLanguage()
+    {
         $this->objFromFixture('Member', 'admin')->login(); //Login admin
-        
+
         
         //Create a test language
         $lang=new SnippetLanguage();
@@ -381,7 +395,8 @@ public function testEditLanguage() {
     /**
      * Tests creating a snippet from the api
      */
-    public function testNewSnippet() {
+    public function testNewSnippet()
+    {
         $this->objFromFixture('Member', 'apiuser')->login();
         
         
@@ -419,7 +434,8 @@ public function testNewSnippet() {
     /**
      * Tests saving a snippet through the api
      */
-    public function testSaveSnippet() {
+    public function testSaveSnippet()
+    {
         $this->objFromFixture('Member', 'apiuser')->login();
         $snippet=$this->objFromFixture('Snippet', 'snippet1');
         
@@ -442,7 +458,8 @@ public function testSaveSnippet() {
     /**
      * Tests deleting a snippet through the api
      */
-    public function testDeleteSnippet() {
+    public function testDeleteSnippet()
+    {
         $this->objFromFixture('Member', 'noaccess')->login();
         $snippet=$this->objFromFixture('Snippet', 'snippet1');
         
@@ -473,7 +490,8 @@ public function testDeleteSnippet() {
     /**
      * Tests removing a snippet from a package
      */
-    public function testRemoveSnippetFromPackage() {
+    public function testRemoveSnippetFromPackage()
+    {
         $this->objFromFixture('Member', 'apiuser')->login();
         
         $package=$this->objFromFixture('SnippetPackage', 'package1');
@@ -498,7 +516,8 @@ public function testRemoveSnippetFromPackage() {
     /**
      * Tests adding a snippet to a package
      */
-    public function testAddSnippetToPackage() {
+    public function testAddSnippetToPackage()
+    {
         $this->objFromFixture('Member', 'apiuser')->login();
         
         $package=$this->objFromFixture('SnippetPackage', 'package1');
@@ -523,7 +542,8 @@ public function testAddSnippetToPackage() {
     /**
      * Tests creating a package
      */
-    public function testCreatePackage() {
+    public function testCreatePackage()
+    {
         $this->objFromFixture('Member', 'apiuser')->login();
         
         
@@ -540,7 +560,8 @@ public function testCreatePackage() {
     /**
      * Tests saving a package
      */
-    public function testSavingPackage() {
+    public function testSavingPackage()
+    {
         $this->objFromFixture('Member', 'apiuser')->login();
         
         
@@ -558,7 +579,8 @@ public function testSavingPackage() {
     /**
      * Tests deleting a package
      */
-    public function testDeletePackage() {
+    public function testDeletePackage()
+    {
         $this->objFromFixture('Member', 'apiuser')->login();
         
         
@@ -575,7 +597,8 @@ public function testDeletePackage() {
     /**
      * Tests creating a folder, as well as checks to see that the duplicate detection is working and that detection for different languages is also working
      */
-    public function testCreatingFolder() {
+    public function testCreatingFolder()
+    {
         $this->objFromFixture('Member', 'apiuser')->login();
         $languageID=SnippetLanguage::get()->filter('Name', 'CSS')->first()->ID;
         
@@ -622,7 +645,8 @@ public function testCreatingFolder() {
     /**
      * Tests renaming a folder, also tests to ensure that the duplicate checking is working
      */
-    public function testRenameFolder() {
+    public function testRenameFolder()
+    {
         $this->objFromFixture('Member', 'apiuser')->login();
         
 
@@ -652,7 +676,8 @@ public function testRenameFolder() {
     /**
      * Tests to see that if a folder is deleted the decendent folders are moved up to the language and that the snippets are also removed correctly
      */
-    public function testDeleteFolder() {
+    public function testDeleteFolder()
+    {
         $this->objFromFixture('Member', 'apiuser')->login();
         
 
@@ -675,7 +700,8 @@ public function testDeleteFolder() {
     /**
      * Tests moving a snippet to a folder, then to one in another language
      */
-    public function testMoveSnippet() {
+    public function testMoveSnippet()
+    {
         $this->objFromFixture('Member', 'apiuser')->login();
         
         $snippet=$this->objFromFixture('Snippet', 'snippet1');
@@ -712,7 +738,8 @@ public function testMoveSnippet() {
     /**
      * Tests to see is snippet search is working as expected
      */
-    public function testSnippetSearch() {
+    public function testSnippetSearch()
+    {
         $this->objFromFixture('Member', 'apiuser')->login();
         
 
@@ -727,13 +754,13 @@ public function testSnippetSearch() {
         
         $expectedSnippet=$this->objFromFixture('Snippet', 'snippet1');
         $found=false;
-        if(is_array($response['data']) && count($response['data'])>0) {
-            foreach($response['data'] as $language) {
-                if(is_array($language['folders']) && count($language['folders'])>0) {
-                    foreach($language['folders'] as $folder) {
-                        if(is_array($folder['snippets']) && count($folder['snippets'])>0) {
-                            foreach($folder['snippets'] as $snippet) {
-                                if($snippet->id==$expectedSnippet->ID) {
+        if (is_array($response['data']) && count($response['data'])>0) {
+            foreach ($response['data'] as $language) {
+                if (is_array($language['folders']) && count($language['folders'])>0) {
+                    foreach ($language['folders'] as $folder) {
+                        if (is_array($folder['snippets']) && count($folder['snippets'])>0) {
+                            foreach ($folder['snippets'] as $snippet) {
+                                if ($snippet->id==$expectedSnippet->ID) {
                                     $found=true;
                                     break;
                                 }
@@ -753,10 +780,11 @@ public function testSnippetSearch() {
      * @param {array} $data Associative array of data to be converted into a request object
      * @return {stdObject} Standard php object to be sent to the client
      */
-    protected function arrayToObject($data) {
+    protected function arrayToObject($data)
+    {
         $request=new stdClass();
         
-        foreach($data as $prop=>$value) {
+        foreach ($data as $prop=>$value) {
             $request->$prop=$value;
         }
         
@@ -769,7 +797,8 @@ protected function arrayToObject($data) {
      * @param {object|array} $data Data to be sent with the request should be an array or an object
      * @return {array} Server response
      */
-    protected function getAMFResponse($servicePath, $data=null) {
+    protected function getAMFResponse($servicePath, $data=null)
+    {
         require_once 'Zend/Amf/Request.php';
         require_once 'Zend/Amf/Constants.php';
         require_once 'Zend/Amf/Value/MessageBody.php';
@@ -777,10 +806,10 @@ protected function getAMFResponse($servicePath, $data=null) {
         require_once 'Zend/Amf/Value/Messaging/ErrorMessage.php';
         
         
-        if($data) {
-            if(is_array($data)) {
+        if ($data) {
+            if (is_array($data)) {
                 $data=$this->arrayToObject($data);
-            }else if(!is_object($data)) {
+            } elseif (!is_object($data)) {
                 user_error('$data is not an array or object', E_USER_ERROR);
             }
         }
@@ -821,9 +850,9 @@ protected function getAMFResponse($servicePath, $data=null) {
         
         //Get the amf bodies
         $bodies=$response->getAmfBodies();
-        if(count($bodies)>0) {
+        if (count($bodies)>0) {
             $body=$bodies[0]->getData();
-            if($body instanceof Zend_Amf_Value_Messaging_ErrorMessage) {
+            if ($body instanceof Zend_Amf_Value_Messaging_ErrorMessage) {
                 $this->fail('AMF Server returned an error: '. $body->faultString."\n\n".$body->faultDetail);
                 
                 return false;
@@ -835,4 +864,3 @@ protected function getAMFResponse($servicePath, $data=null) {
         return false;
     }
 }
-?>
\ No newline at end of file
diff --git a/tests/SnippetHierarchyTest.php b/tests/SnippetHierarchyTest.php
index 0f783d1..e6043b4 100644
--- a/tests/SnippetHierarchyTest.php
+++ b/tests/SnippetHierarchyTest.php
@@ -1,79 +1,84 @@
-<?php
-class SnippetHierarchyTest extends SapphireTest {
-    public static $fixture_file='SnippetTest.yml';
-    
-    /**
-     * Forces the snippet languages to be populated on setup
-     */
-    public function setUp() {
-        parent::setUp();
-        
-        //Populate default languages
-        singleton('SnippetLanguage')->requireDefaultRecords();
-    }
-    
-    /**
-     * Tests to verify that the children of the language are what is expected
-     */
-    public function testLanguageChildren() {
-        $language=SnippetLanguage::get()->filter('Name', 'PHP')->first();
-        
-        
-        //Test to see if the first child of the language is a folder
-        $this->assertInstanceOf('SnippetFolder', $language->Children()->offsetGet(0), 'There should be a snippet folder as the first child of the language');
-        
-        
-        //Test to see if the first child of the language is "Test Folder"
-        $this->assertEquals('Test Folder', $language->Children()->offsetGet(0)->Title, '"Test Folder" should be the first child of the language');
-        
-        
-        //Test to see if the second child of the language is a snippet
-        $this->assertInstanceOf('Snippet', $language->Children()->offsetGet(2), 'There should be a snippet as the third child of the language');
-        
-        
-        //Test to see if the second child of the language is "PHP Test 2"
-        $this->assertEquals('PHP Test 2', $language->Children()->offsetGet(2)->Title, '"PHP Test 2" should be the third child of the language');
-        
-        
-        //Test to ensure there are only 3 children the second snippet "PHP Test" should be a child of the folder
-        $this->assertNull($language->Children()->offsetGet(3), 'There should be no more children of this language');
-    }
-    
-    /**
-     * Tests to verify that the children of the folder are what is expected
-     */
-    public function testFolderChildren() {
-        $folder=$this->objFromFixture('SnippetFolder', 'folder1');
-        
-        
-        //Test to see if the first child is a snippet
-        $this->assertInstanceOf('Snippet', $folder->Children()->offsetGet(0));
-        
-        
-        //Test to see if the second child of the language is "PHP Test"
-        $this->assertEquals('PHP Test', $folder->Children()->offsetGet(0)->Title, '"PHP Test" should be the second child of the language');
-        
-        
-        //Test to ensure there are only 1 child the third snippet
-        $this->assertNull($folder->Children()->offsetGet(1), 'There should be no more children of this folder');
-    }
-    
-    /**
-     * Tests to see that the language only contains three children, the 4th child should be considered a child of the folder
-     */
-    public function testLanguageChildrenCount() {
-        $language=SnippetLanguage::get()->filter('Name', 'PHP')->first();
-        
-        $this->assertEquals(3, $language->Children()->count(), 'There should be 3 children of the language');
-    }
-    
-    /**
-     * Tests to see that the folder only contains one child
-     */
-    public function testFolderChildrenCount() {
-        $folder=$this->objFromFixture('SnippetFolder', 'folder1');
-        
-        $this->assertEquals(1, $folder->Children()->count(), 'There should be 1 child of the folder');
-    }
-}
-?>
\ No newline at end of file
+<?php
+class SnippetHierarchyTest extends SapphireTest
+{
+    public static $fixture_file='SnippetTest.yml';
+    
+    /**
+     * Forces the snippet languages to be populated on setup
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        
+        //Populate default languages
+        singleton('SnippetLanguage')->requireDefaultRecords();
+    }
+    
+    /**
+     * Tests to verify that the children of the language are what is expected
+     */
+    public function testLanguageChildren()
+    {
+        $language=SnippetLanguage::get()->filter('Name', 'PHP')->first();
+        
+        
+        //Test to see if the first child of the language is a folder
+        $this->assertInstanceOf('SnippetFolder', $language->Children()->offsetGet(0), 'There should be a snippet folder as the first child of the language');
+        
+        
+        //Test to see if the first child of the language is "Test Folder"
+        $this->assertEquals('Test Folder', $language->Children()->offsetGet(0)->Title, '"Test Folder" should be the first child of the language');
+        
+        
+        //Test to see if the second child of the language is a snippet
+        $this->assertInstanceOf('Snippet', $language->Children()->offsetGet(2), 'There should be a snippet as the third child of the language');
+        
+        
+        //Test to see if the second child of the language is "PHP Test 2"
+        $this->assertEquals('PHP Test 2', $language->Children()->offsetGet(2)->Title, '"PHP Test 2" should be the third child of the language');
+        
+        
+        //Test to ensure there are only 3 children the second snippet "PHP Test" should be a child of the folder
+        $this->assertNull($language->Children()->offsetGet(3), 'There should be no more children of this language');
+    }
+    
+    /**
+     * Tests to verify that the children of the folder are what is expected
+     */
+    public function testFolderChildren()
+    {
+        $folder=$this->objFromFixture('SnippetFolder', 'folder1');
+        
+        
+        //Test to see if the first child is a snippet
+        $this->assertInstanceOf('Snippet', $folder->Children()->offsetGet(0));
+        
+        
+        //Test to see if the second child of the language is "PHP Test"
+        $this->assertEquals('PHP Test', $folder->Children()->offsetGet(0)->Title, '"PHP Test" should be the second child of the language');
+        
+        
+        //Test to ensure there are only 1 child the third snippet
+        $this->assertNull($folder->Children()->offsetGet(1), 'There should be no more children of this folder');
+    }
+    
+    /**
+     * Tests to see that the language only contains three children, the 4th child should be considered a child of the folder
+     */
+    public function testLanguageChildrenCount()
+    {
+        $language=SnippetLanguage::get()->filter('Name', 'PHP')->first();
+        
+        $this->assertEquals(3, $language->Children()->count(), 'There should be 3 children of the language');
+    }
+    
+    /**
+     * Tests to see that the folder only contains one child
+     */
+    public function testFolderChildrenCount()
+    {
+        $folder=$this->objFromFixture('SnippetFolder', 'folder1');
+        
+        $this->assertEquals(1, $folder->Children()->count(), 'There should be 1 child of the folder');
+    }
+}
diff --git a/tests/SnippetLanguageTest.php b/tests/SnippetLanguageTest.php
index 895ec8f..45e026b 100644
--- a/tests/SnippetLanguageTest.php
+++ b/tests/SnippetLanguageTest.php
@@ -1,209 +1,220 @@
-<?php
-class SnippetLanguageTest extends SapphireTest {
-    public static $fixture_file='SnippetLanguageTest.yml';
-    
-    public function setUp() {
-        parent::setUp();
-        
-        
-        //Remove the extra_languages config key from code bank, ensures we don't have bad config languages defined elsewhere
-        Config::inst()->remove('CodeBank', 'extra_languages');
-
-
-        //Populate default languages
-        singleton('SnippetLanguage')->requireDefaultRecords();
-    }
-    
-    public function tearDown() {
-        parent::tearDown();
-        
-        //Remove the extra_languages config key from code bank, cleans up after running the unit tests
-        Config::inst()->remove('CodeBank', 'extra_languages');
-    }
-    
-    /**
-     * Checks to see if the user can't delete a default language
-     */
-    public function testCantDeleteDefaultLanguage() {
-        $language=SnippetLanguage::get()->filter('Name', 'PHP')->first();
-        
-        
-        $this->assertEquals(false, $language->canDelete(), 'User can delete a default language');
-    }
-    
-    /**
-     * Tests to see if a user can delete a user language without children
-     */
-    public function testCanDeleteUserLanguage() {
-        $language=$this->objFromFixture('SnippetLanguage', 'language2');
-        
-        
-        $this->assertEquals(true, $language->canDelete(), 'User can\'t delete a user language');
-    }
-    
-    /**
-     * Tests to see that a user can't delete a user language with snippets
-     */
-    public function testCantDeleteUserLanguageWithSnippet() {
-        $language=$this->objFromFixture('SnippetLanguage', 'language1');
-        
-        
-        $this->assertEquals(false, $language->canDelete(), 'User can\'t delete a user language with a snippet');
-    }
-    
-    /**
-     * Tests to see that a user can't delete a user language with folders
-     */
-    public function testCantDeleteUserLanguageWithFolder() {
-        $language=$this->objFromFixture('SnippetLanguage', 'language3');
-        
-        
-        $this->assertEquals(false, $language->canDelete(), 'User can delete a user language with a folder');
-    }
-    
-    /**
-     * Tests to see if a valid language can be added via the config layer
-     */
-    public function testValidCustomLanguage() {
-        CodeBank::config()->extra_languages=array(array(
-                                                'Name'=>'Test Language',
-                                                'FileName'=>'tst',
-                                                'HighlightCode'=>'tst',
-                                                'Brush'=>'CodeBank/tests/files/testBrush.js'
-                                            ));
-        
-        //Try populating the default records
-        singleton('SnippetLanguage')->requireDefaultRecords();
-        
-        
-        //Make sure it was added
-        $this->assertEquals(1, SnippetLanguage::get()->filter('Name', 'Test Language')->count(), 'User language was not created');
-    }
-    
-    /**
-     * Tests to see if a language defined in the config missing components generates an error and is not added
-     */
-    public function testInvalidCustomLanguage() {
-        CodeBank::config()->extra_languages=array(array(
-                                                'Name'=>'Test Language 1',
-                                                'HighlightCode'=>'tst1'
-                                            ));
-        
-        $didExpectedError=false;
-        try {
-            //Try populating the default records
-            singleton('SnippetLanguage')->requireDefaultRecords();
-        }catch(PHPUnit_Framework_Error_Warning $e) {
-            if(strpos($e->getMessage(), 'Invalid snippet user language found in config')!==false) {
-                $didExpectedError=true;
-            }else {
-                throw $e; //Ensure the error is re-thrown, it doesn't match what we're expecting
-            }
-        }
-        
-        
-        //Check to see if the error was thrown
-        $this->assertEquals(true, $didExpectedError);
-        
-        
-        //Make sure it was added
-        $this->assertEquals(0, SnippetLanguage::get()->filter('Name', 'Test Language 1')->count(), 'Invalid language was created');
-    }
-    
-    /**
-     * Tests to see if a language defined in the config with a remote url generates an error and is not added
-     */
-    public function testCustomLanguageBrushInvalidRemotePath() {
-        CodeBank::config()->extra_languages=array(array(
-                                                'Name'=>'Test Language 2',
-                                                'FileName'=>'tst',
-                                                'HighlightCode'=>'tst2',
-                                                'Brush'=>'http://www.example.com/testBrush.js'
-                                            ));
-        
-        $didExpectedError=false;
-        try {
-            //Try populating the default records
-            singleton('SnippetLanguage')->requireDefaultRecords();
-        }catch(PHPUnit_Framework_Error_Warning $e) {
-            if(strpos($e->getMessage(), 'Invalid snippet user language found in config')!==false) {
-                $didExpectedError=true;
-            }else {
-                throw $e; //Ensure the error is re-thrown, it doesn't match what we're expecting
-            }
-        }
-        
-        
-        //Check to see if the error was thrown
-        $this->assertEquals(true, $didExpectedError);
-        
-        
-        //Make sure it was added
-        $this->assertEquals(0, SnippetLanguage::get()->filter('Name', 'Test Language 2')->count(), 'Invalid language was created');
-    }
-    
-    /**
-     * Tests to see if a language defined in the config with a absolute file path generates an error and is not added
-     */
-    public function testCustomLanguageBrushInvalidLocalPath() {
-        CodeBank::config()->extra_languages=array(array(
-                                                'Name'=>'Test Language 3',
-                                                'FileName'=>'tst',
-                                                'HighlightCode'=>'tst3',
-                                                'Brush'=>'/testBrush.js'
-                                            ));
-        
-        $didExpectedError=false;
-        try {
-            //Try populating the default records
-            singleton('SnippetLanguage')->requireDefaultRecords();
-        }catch(PHPUnit_Framework_Error_Warning $e) {
-            if(strpos($e->getMessage(), 'Invalid snippet user language found in config')!==false) {
-                $didExpectedError=true;
-            }else {
-                throw $e; //Ensure the error is re-thrown, it doesn't match what we're expecting
-            }
-        }
-        
-        
-        //Check to see if the error was thrown
-        $this->assertEquals(true, $didExpectedError);
-        
-        
-        //Make sure it was added
-        $this->assertEquals(0, SnippetLanguage::get()->filter('Name', 'Test Language 3')->count(), 'Invalid language was created');
-    }
-    
-    /**
-     * Tests to see if a language defined in the config with a brush that does not end in .js generates an error and is not added
-     */
-    public function testNonJSCustomLanguageBrush() {
-        CodeBank::config()->extra_languages=array(array(
-                                                'Name'=>'Test Language 4',
-                                                'FileName'=>'tst',
-                                                'HighlightCode'=>'tst4',
-                                                'Brush'=>'CodeBank/tests/files/testBrush.lorem'
-                                            ));
-        
-        $didExpectedError=false;
-        try {
-            //Try populating the default records
-            singleton('SnippetLanguage')->requireDefaultRecords();
-        }catch(PHPUnit_Framework_Error_Warning $e) {
-            if(strpos($e->getMessage(), 'Invalid snippet user language found in config')!==false) {
-                $didExpectedError=true;
-            }else {
-                throw $e; //Ensure the error is re-thrown, it doesn't match what we're expecting
-            }
-        }
-
-
-        //Check to see if the error was thrown
-        $this->assertEquals(true, $didExpectedError);
-        
-        
-        //Make sure it was added
-        $this->assertEquals(0, SnippetLanguage::get()->filter('Name', 'Test Language 4')->count(), 'Invalid language was created');
-    }
-}
-?>
\ No newline at end of file
+<?php
+class SnippetLanguageTest extends SapphireTest
+{
+    public static $fixture_file='SnippetLanguageTest.yml';
+    
+    public function setUp()
+    {
+        parent::setUp();
+        
+        
+        //Remove the extra_languages config key from code bank, ensures we don't have bad config languages defined elsewhere
+        Config::inst()->remove('CodeBank', 'extra_languages');
+
+
+        //Populate default languages
+        singleton('SnippetLanguage')->requireDefaultRecords();
+    }
+    
+    public function tearDown()
+    {
+        parent::tearDown();
+        
+        //Remove the extra_languages config key from code bank, cleans up after running the unit tests
+        Config::inst()->remove('CodeBank', 'extra_languages');
+    }
+    
+    /**
+     * Checks to see if the user can't delete a default language
+     */
+    public function testCantDeleteDefaultLanguage()
+    {
+        $language=SnippetLanguage::get()->filter('Name', 'PHP')->first();
+        
+        
+        $this->assertEquals(false, $language->canDelete(), 'User can delete a default language');
+    }
+    
+    /**
+     * Tests to see if a user can delete a user language without children
+     */
+    public function testCanDeleteUserLanguage()
+    {
+        $language=$this->objFromFixture('SnippetLanguage', 'language2');
+        
+        
+        $this->assertEquals(true, $language->canDelete(), 'User can\'t delete a user language');
+    }
+    
+    /**
+     * Tests to see that a user can't delete a user language with snippets
+     */
+    public function testCantDeleteUserLanguageWithSnippet()
+    {
+        $language=$this->objFromFixture('SnippetLanguage', 'language1');
+        
+        
+        $this->assertEquals(false, $language->canDelete(), 'User can\'t delete a user language with a snippet');
+    }
+    
+    /**
+     * Tests to see that a user can't delete a user language with folders
+     */
+    public function testCantDeleteUserLanguageWithFolder()
+    {
+        $language=$this->objFromFixture('SnippetLanguage', 'language3');
+        
+        
+        $this->assertEquals(false, $language->canDelete(), 'User can delete a user language with a folder');
+    }
+    
+    /**
+     * Tests to see if a valid language can be added via the config layer
+     */
+    public function testValidCustomLanguage()
+    {
+        CodeBank::config()->extra_languages=array(array(
+                                                'Name'=>'Test Language',
+                                                'FileName'=>'tst',
+                                                'HighlightCode'=>'tst',
+                                                'Brush'=>'CodeBank/tests/files/testBrush.js'
+                                            ));
+        
+        //Try populating the default records
+        singleton('SnippetLanguage')->requireDefaultRecords();
+        
+        
+        //Make sure it was added
+        $this->assertEquals(1, SnippetLanguage::get()->filter('Name', 'Test Language')->count(), 'User language was not created');
+    }
+    
+    /**
+     * Tests to see if a language defined in the config missing components generates an error and is not added
+     */
+    public function testInvalidCustomLanguage()
+    {
+        CodeBank::config()->extra_languages=array(array(
+                                                'Name'=>'Test Language 1',
+                                                'HighlightCode'=>'tst1'
+                                            ));
+        
+        $didExpectedError=false;
+        try {
+            //Try populating the default records
+            singleton('SnippetLanguage')->requireDefaultRecords();
+        } catch (PHPUnit_Framework_Error_Warning $e) {
+            if (strpos($e->getMessage(), 'Invalid snippet user language found in config')!==false) {
+                $didExpectedError=true;
+            } else {
+                throw $e; //Ensure the error is re-thrown, it doesn't match what we're expecting
+            }
+        }
+        
+        
+        //Check to see if the error was thrown
+        $this->assertEquals(true, $didExpectedError);
+        
+        
+        //Make sure it was added
+        $this->assertEquals(0, SnippetLanguage::get()->filter('Name', 'Test Language 1')->count(), 'Invalid language was created');
+    }
+    
+    /**
+     * Tests to see if a language defined in the config with a remote url generates an error and is not added
+     */
+    public function testCustomLanguageBrushInvalidRemotePath()
+    {
+        CodeBank::config()->extra_languages=array(array(
+                                                'Name'=>'Test Language 2',
+                                                'FileName'=>'tst',
+                                                'HighlightCode'=>'tst2',
+                                                'Brush'=>'http://www.example.com/testBrush.js'
+                                            ));
+        
+        $didExpectedError=false;
+        try {
+            //Try populating the default records
+            singleton('SnippetLanguage')->requireDefaultRecords();
+        } catch (PHPUnit_Framework_Error_Warning $e) {
+            if (strpos($e->getMessage(), 'Invalid snippet user language found in config')!==false) {
+                $didExpectedError=true;
+            } else {
+                throw $e; //Ensure the error is re-thrown, it doesn't match what we're expecting
+            }
+        }
+        
+        
+        //Check to see if the error was thrown
+        $this->assertEquals(true, $didExpectedError);
+        
+        
+        //Make sure it was added
+        $this->assertEquals(0, SnippetLanguage::get()->filter('Name', 'Test Language 2')->count(), 'Invalid language was created');
+    }
+    
+    /**
+     * Tests to see if a language defined in the config with a absolute file path generates an error and is not added
+     */
+    public function testCustomLanguageBrushInvalidLocalPath()
+    {
+        CodeBank::config()->extra_languages=array(array(
+                                                'Name'=>'Test Language 3',
+                                                'FileName'=>'tst',
+                                                'HighlightCode'=>'tst3',
+                                                'Brush'=>'/testBrush.js'
+                                            ));
+        
+        $didExpectedError=false;
+        try {
+            //Try populating the default records
+            singleton('SnippetLanguage')->requireDefaultRecords();
+        } catch (PHPUnit_Framework_Error_Warning $e) {
+            if (strpos($e->getMessage(), 'Invalid snippet user language found in config')!==false) {
+                $didExpectedError=true;
+            } else {
+                throw $e; //Ensure the error is re-thrown, it doesn't match what we're expecting
+            }
+        }
+        
+        
+        //Check to see if the error was thrown
+        $this->assertEquals(true, $didExpectedError);
+        
+        
+        //Make sure it was added
+        $this->assertEquals(0, SnippetLanguage::get()->filter('Name', 'Test Language 3')->count(), 'Invalid language was created');
+    }
+    
+    /**
+     * Tests to see if a language defined in the config with a brush that does not end in .js generates an error and is not added
+     */
+    public function testNonJSCustomLanguageBrush()
+    {
+        CodeBank::config()->extra_languages=array(array(
+                                                'Name'=>'Test Language 4',
+                                                'FileName'=>'tst',
+                                                'HighlightCode'=>'tst4',
+                                                'Brush'=>'CodeBank/tests/files/testBrush.lorem'
+                                            ));
+        
+        $didExpectedError=false;
+        try {
+            //Try populating the default records
+            singleton('SnippetLanguage')->requireDefaultRecords();
+        } catch (PHPUnit_Framework_Error_Warning $e) {
+            if (strpos($e->getMessage(), 'Invalid snippet user language found in config')!==false) {
+                $didExpectedError=true;
+            } else {
+                throw $e; //Ensure the error is re-thrown, it doesn't match what we're expecting
+            }
+        }
+
+
+        //Check to see if the error was thrown
+        $this->assertEquals(true, $didExpectedError);
+        
+        
+        //Make sure it was added
+        $this->assertEquals(0, SnippetLanguage::get()->filter('Name', 'Test Language 4')->count(), 'Invalid language was created');
+    }
+}
diff --git a/tests/SnippetLanguageTest.yml b/tests/SnippetLanguageTest.yml
index 443f1aa..30b2501 100644
--- a/tests/SnippetLanguageTest.yml
+++ b/tests/SnippetLanguageTest.yml
@@ -1,17 +1,17 @@
-SnippetLanguage:
-    language1:
-        Name: "Fixture Language"
-    language2:
-        Name: "Fixture Language 2"
-    language3:
-        Name: "Fixture Language 3"
-
-Snippet:
-    snippet1:
-        Title: "Fixture Snippet"
-        Language: =>SnippetLanguage.language1
-
-SnippetFolder:
-    folder1:
-        Title: "Fixture Folder"
+SnippetLanguage:
+    language1:
+        Name: "Fixture Language"
+    language2:
+        Name: "Fixture Language 2"
+    language3:
+        Name: "Fixture Language 3"
+
+Snippet:
+    snippet1:
+        Title: "Fixture Snippet"
+        Language: =>SnippetLanguage.language1
+
+SnippetFolder:
+    folder1:
+        Title: "Fixture Folder"
         Language: =>SnippetLanguage.language3
\ No newline at end of file
diff --git a/tests/SnippetTest.php b/tests/SnippetTest.php
index 81f4324..f6efbc8 100644
--- a/tests/SnippetTest.php
+++ b/tests/SnippetTest.php
@@ -1,119 +1,126 @@
-<?php
-class SnippetTest extends SapphireTest {
-    public static $fixture_file='SnippetTest.yml';
-    
-    /**
-     * Forces the snippet languages to be populated on setup
-     */
-    public function setUp() {
-        parent::setUp();
-        
-        //Populate default languages
-        singleton('SnippetLanguage')->requireDefaultRecords();
-    }
-    
-    /**
-     * Tests to see if the current version functionality is actually returning the correct version
-     */
-    public function testCurrentVersion() {
-        $snippet=$this->objFromFixture('Snippet', 'snippet1');
-        $version=SnippetVersion::get()->filter('Created', '2014-04-27 15:46:00')->first();
-        
-        
-        //Test that we have a current version
-        $this->assertInstanceOf('SnippetVersion', $snippet->CurrentVersion, 'Snippet\'s current version is not present');
-        $this->assertGreaterThan(0, $snippet->CurrentVersion->ID, 'Snippet\'s current version is not present');
-        
-        
-        //Test that the version is correctly associated with the parent
-        $this->assertEquals($version->ParentID, $snippet->ID, 'Test error, version is not lining up with it\'s snippet');
-        
-        
-        //Test that the current version is the expected version
-        $this->assertEquals($version->ID, $snippet->CurrentVersion->ID, 'Snippet\'s current version is not matching what should be the head version');
-    }
-    
-    /**
-     * Tests to ensure that the snippet text is what it should be at the current version
-     */
-    public function testSnippetText() {
-        $snippet=$this->objFromFixture('Snippet', 'snippet1');
-        
-        $this->assertEquals("<?php print 'Hello World'; ?>", $snippet->SnippetText, 'Snippet text is not matching the head version');
-    }
-    
-    /**
-     * Tests to see if a version is created when we update the snippet's text
-     */
-    public function testVersionCreation() {
-        $snippet=$this->objFromFixture('Snippet', 'snippet1');
-        
-        //Fetch the current version id
-        $priorVersionID=$snippet->CurrentVersionID;
-        
-        //Change the snippet and write
-        $snippet->Text="<?php print 'This is a test'; ?>";
-        $snippet->write();
-        
-        
-        //Check to see if a new version was created
-        $this->assertGreaterThan($priorVersionID, $snippet->CurrentVersionID, 'A new snippet version was not created');
-        
-        
-        //Check to see if the version text matches what we set it to
-        $this->assertEquals("<?php print 'This is a test'; ?>", $snippet->SnippetText, 'Current version\'s text does not match what was set');
-    }
-    
-    /**
-     * Tests to see if the proper brush name is loaded for the snippet
-     */
-    public function testBrushName() {
-        $snippet=$this->objFromFixture('Snippet', 'snippet1');
-        
-        $this->assertEquals('shBrushPhp', $snippet->BrushName, 'Snippet brush name should be shBrushPhp');
-    }
-
-    /**
-     * Tests to see if the folder is reset after changing to another language id
-     */
-    public function testFolderResetOnNewLanguage() {
-        $snippet=$this->objFromFixture('Snippet', 'snippet1');
-        
-        
-        //Ensure the snippet's folder id has been populated
-        $this->assertGreaterThan(0, $snippet->FolderID, 'Snippet folder ID is already zero');
-        
-        
-        $snippet->LanguageID=9;
-        $snippet->write();
-        
-        
-        //Reload the snippet to ensure we have the database's version
-        $snippet=$this->objFromFixture('Snippet', 'snippet1');
-        
-        
-        //Ensure the snippets folder id has been reset
-        $this->assertEquals(0, $snippet->FolderID);
-    }
-
-    /**
-     * Tests to see if the versions for a snippet are actually removed when the snippet is deleted using a call to DataObject::delete()
-     */
-    public function testVersionCleanupOnDelete() {
-        $snippet=$this->objFromFixture('Snippet', 'snippet1');
-        $snippetID=$snippet->ID;
-        
-        
-        //Verify that there are snippet versions for the located snippet
-        $this->assertGreaterThan(0, SnippetVersion::get()->filter('ParentID', $snippetID)->count(), 'Snippet versions cannot be found');
-        
-        
-        //Delete the snippet
-        $snippet->delete();
-        
-        
-        //Test to see if the versions have been properly removed
-        $this->assertEquals(0, SnippetVersion::get()->filter('ParentID', $snippetID)->count(), 'Snippet versions were found');
-    }
-}
-?>
\ No newline at end of file
+<?php
+class SnippetTest extends SapphireTest
+{
+    public static $fixture_file='SnippetTest.yml';
+    
+    /**
+     * Forces the snippet languages to be populated on setup
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        
+        //Populate default languages
+        singleton('SnippetLanguage')->requireDefaultRecords();
+    }
+    
+    /**
+     * Tests to see if the current version functionality is actually returning the correct version
+     */
+    public function testCurrentVersion()
+    {
+        $snippet=$this->objFromFixture('Snippet', 'snippet1');
+        $version=SnippetVersion::get()->filter('Created', '2014-04-27 15:46:00')->first();
+        
+        
+        //Test that we have a current version
+        $this->assertInstanceOf('SnippetVersion', $snippet->CurrentVersion, 'Snippet\'s current version is not present');
+        $this->assertGreaterThan(0, $snippet->CurrentVersion->ID, 'Snippet\'s current version is not present');
+        
+        
+        //Test that the version is correctly associated with the parent
+        $this->assertEquals($version->ParentID, $snippet->ID, 'Test error, version is not lining up with it\'s snippet');
+        
+        
+        //Test that the current version is the expected version
+        $this->assertEquals($version->ID, $snippet->CurrentVersion->ID, 'Snippet\'s current version is not matching what should be the head version');
+    }
+    
+    /**
+     * Tests to ensure that the snippet text is what it should be at the current version
+     */
+    public function testSnippetText()
+    {
+        $snippet=$this->objFromFixture('Snippet', 'snippet1');
+        
+        $this->assertEquals("<?php print 'Hello World'; ?>", $snippet->SnippetText, 'Snippet text is not matching the head version');
+    }
+    
+    /**
+     * Tests to see if a version is created when we update the snippet's text
+     */
+    public function testVersionCreation()
+    {
+        $snippet=$this->objFromFixture('Snippet', 'snippet1');
+        
+        //Fetch the current version id
+        $priorVersionID=$snippet->CurrentVersionID;
+        
+        //Change the snippet and write
+        $snippet->Text="<?php print 'This is a test'; ?>";
+        $snippet->write();
+        
+        
+        //Check to see if a new version was created
+        $this->assertGreaterThan($priorVersionID, $snippet->CurrentVersionID, 'A new snippet version was not created');
+        
+        
+        //Check to see if the version text matches what we set it to
+        $this->assertEquals("<?php print 'This is a test'; ?>", $snippet->SnippetText, 'Current version\'s text does not match what was set');
+    }
+    
+    /**
+     * Tests to see if the proper brush name is loaded for the snippet
+     */
+    public function testBrushName()
+    {
+        $snippet=$this->objFromFixture('Snippet', 'snippet1');
+        
+        $this->assertEquals('shBrushPhp', $snippet->BrushName, 'Snippet brush name should be shBrushPhp');
+    }
+
+    /**
+     * Tests to see if the folder is reset after changing to another language id
+     */
+    public function testFolderResetOnNewLanguage()
+    {
+        $snippet=$this->objFromFixture('Snippet', 'snippet1');
+        
+        
+        //Ensure the snippet's folder id has been populated
+        $this->assertGreaterThan(0, $snippet->FolderID, 'Snippet folder ID is already zero');
+        
+        
+        $snippet->LanguageID=9;
+        $snippet->write();
+        
+        
+        //Reload the snippet to ensure we have the database's version
+        $snippet=$this->objFromFixture('Snippet', 'snippet1');
+        
+        
+        //Ensure the snippets folder id has been reset
+        $this->assertEquals(0, $snippet->FolderID);
+    }
+
+    /**
+     * Tests to see if the versions for a snippet are actually removed when the snippet is deleted using a call to DataObject::delete()
+     */
+    public function testVersionCleanupOnDelete()
+    {
+        $snippet=$this->objFromFixture('Snippet', 'snippet1');
+        $snippetID=$snippet->ID;
+        
+        
+        //Verify that there are snippet versions for the located snippet
+        $this->assertGreaterThan(0, SnippetVersion::get()->filter('ParentID', $snippetID)->count(), 'Snippet versions cannot be found');
+        
+        
+        //Delete the snippet
+        $snippet->delete();
+        
+        
+        //Test to see if the versions have been properly removed
+        $this->assertEquals(0, SnippetVersion::get()->filter('ParentID', $snippetID)->count(), 'Snippet versions were found');
+    }
+}