diff --git a/sites/all/modules/field_permissions/field_permissions.admin.inc b/sites/all/modules/field_permissions/field_permissions.admin.inc
index 6d83057..45f0440 100644
--- a/sites/all/modules/field_permissions/field_permissions.admin.inc
+++ b/sites/all/modules/field_permissions/field_permissions.admin.inc
@@ -336,7 +336,7 @@ function _field_permissions_field_settings_form_submit($form, &$form_state) {
  * Menu callback; Field permissions overview.
  */
 function field_permissions_overview() {
-  drupal_add_css(drupal_get_path('module', 'field_permissions') .'/field_permissions.admin.css');
+  drupal_add_css(drupal_get_path('module', 'field_permissions') . '/field_permissions.admin.css');
 
   $headers = array(t('Field name'), t('Field type'), t('Entity type'), t('Used in'));
   foreach (field_permissions_list() as $permission_type => $permission_info) {
@@ -435,7 +435,7 @@ function field_permissions_overview() {
 
     // Allow external modules alter the table headers and rows.
     foreach (module_implements('field_permissions_overview_alter') as $module) {
-      $function = $module .'_field_permissions_overview_alter';
+      $function = $module . '_field_permissions_overview_alter';
       $function($headers, $rows);
     }
 
diff --git a/sites/all/modules/field_permissions/field_permissions.install b/sites/all/modules/field_permissions/field_permissions.install
index e4fac9a..68201c2 100644
--- a/sites/all/modules/field_permissions/field_permissions.install
+++ b/sites/all/modules/field_permissions/field_permissions.install
@@ -24,7 +24,7 @@ function field_permissions_uninstall() {
   // Collect all the field data that reference "field_permissions", within
   // the field_config table.
   //
-  $records = db_query("SELECT * FROM field_config WHERE data LIKE '%field_permissions%'");
+  $records = db_query("SELECT * FROM {field_config} WHERE data LIKE '%field_permissions%'");
 
   foreach ($records as $record) {
     $data = $record->data;
@@ -33,7 +33,7 @@ function field_permissions_uninstall() {
     $data = serialize($data);
 
     // Update the record.
-    db_query("UPDATE field_config SET data = :data WHERE id = :id",
+    db_query("UPDATE {field_config} SET data = :data WHERE id = :id",
       array(':data' => $data, ':id' => $record->id));
   }
 }
diff --git a/sites/all/modules/field_permissions/field_permissions.module b/sites/all/modules/field_permissions/field_permissions.module
index 6e8499d..74c06af 100644
--- a/sites/all/modules/field_permissions/field_permissions.module
+++ b/sites/all/modules/field_permissions/field_permissions.module
@@ -266,7 +266,7 @@ function _field_permissions_entity_is_owned_by_account($entity, $account) {
   // a concept of "ownership"), we need to assume that the provided user
   // account does not own it.
   $uid = isset($entity->uid) ? $entity->uid : FALSE;
-  if(method_exists($entity, 'entityType')) {
+  if (method_exists($entity, 'entityType')) {
     drupal_alter('field_permissions_userid_' . $entity->entityType(), $uid, $entity);
   }
 
diff --git a/sites/all/modules/field_permissions/field_permissions.test b/sites/all/modules/field_permissions/field_permissions.test
index 9cee9fb..611c2d8 100644
--- a/sites/all/modules/field_permissions/field_permissions.test
+++ b/sites/all/modules/field_permissions/field_permissions.test
@@ -183,7 +183,7 @@ class FieldPermissionsTestCase extends DrupalWebTestCase {
 
     // Grant body creation permission to limited users too.
     $edit = array(
-      $this->limited_rid .'[create '. $field_info['machine_name'] .']' => TRUE,
+      $this->limited_rid . '[create ' . $field_info['machine_name'] . ']' => TRUE,
     );
     $this->drupalPost('admin/people/permissions', $edit, t('Save permissions'));
     $this->assertUserHasPermission($this->admin_user, 'create ' . $field_info['machine_name'], t('Admin user does have "create @field" permission.', array('@field' => $field_info['machine_name'])));
@@ -218,7 +218,7 @@ class FieldPermissionsTestCase extends DrupalWebTestCase {
 
     // Grant body view permission to limited users too.
     $edit = array(
-      $this->limited_rid .'[view '. $field_info['machine_name'] .']' => TRUE,
+      $this->limited_rid . '[view ' . $field_info['machine_name'] . ']' => TRUE,
     );
     $this->drupalPost('admin/people/permissions', $edit, t('Save permissions'));
     $this->assertUserHasPermission($this->admin_user, 'view ' . $field_info['machine_name'], t('Admin user does have "view @field" permission.', array('@field' => $field_info['machine_name'])));
@@ -247,7 +247,7 @@ class FieldPermissionsTestCase extends DrupalWebTestCase {
 
     // Grant body editing permission for the limited role.
     $edit = array(
-      $this->limited_rid .'[edit '. $field_info['machine_name'] .']' => TRUE,
+      $this->limited_rid . '[edit ' . $field_info['machine_name'] . ']' => TRUE,
     );
     $this->drupalPost('admin/people/permissions', $edit, t('Save permissions'));
     $this->assertUserHasPermission($this->admin_user, 'edit ' . $field_info['machine_name'], t('Admin user does have "edit @field" permission.', array('@field' => $field_info['machine_name'])));