diff --git a/classes/controllers/FrmFieldsController.php b/classes/controllers/FrmFieldsController.php
index e6d6691c0b..3537b38f47 100644
--- a/classes/controllers/FrmFieldsController.php
+++ b/classes/controllers/FrmFieldsController.php
@@ -48,7 +48,7 @@ public static function load_field() {
         wp_die();
     }
 
-    public static function create(){
+    public static function create() {
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         $field_type = sanitize_text_field( $_POST['field'] );
@@ -62,6 +62,9 @@ public static function create(){
         wp_die();
     }
 
+    /**
+     * @param integer $form_id
+     */
     public static function include_new_field($field_type, $form_id) {
         $values = array();
         if ( FrmAppHelper::pro_is_installed() ) {
@@ -116,7 +119,7 @@ public static function edit_name($field = 'name', $id = '') {
         wp_die();
     }
 
-    public static function update_ajax_option(){
+    public static function update_ajax_option() {
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         $field = FrmField::getOne($_POST['field']);
@@ -140,7 +143,7 @@ public static function update_ajax_option(){
         wp_die();
     }
 
-    public static function duplicate(){
+    public static function duplicate() {
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         global $wpdb;
@@ -188,7 +191,7 @@ public static function include_single_field( $field_id, $values, $form_id = 0 )
         return $field;
     }
 
-    public static function destroy(){
+    public static function destroy() {
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         FrmField::destroy($_POST['field_id']);
@@ -198,7 +201,7 @@ public static function destroy(){
     /* Field Options */
 
     //Add Single Option or Other Option
-    public static function add_option(){
+    public static function add_option() {
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         $id = (int) $_POST['field_id'];
@@ -302,7 +305,7 @@ public static function edit_option() {
         wp_die();
     }
 
-    public static function delete_option(){
+    public static function delete_option() {
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         $field = FrmField::getOne( (int) $_POST['field_id'] );
@@ -388,7 +391,7 @@ public static function import_choices() {
         wp_die();
     }
 
-    public static function import_options(){
+    public static function import_options() {
         check_ajax_referer( 'frm_ajax', 'nonce' );
 
         if ( ! is_admin() || ! current_user_can('frm_edit_forms') ) {
@@ -449,7 +452,7 @@ public static function import_options(){
         wp_die();
     }
 
-    public static function update_order(){
+    public static function update_order() {
         check_ajax_referer( 'frm_ajax', 'nonce' );
         if ( isset($_POST) && isset($_POST['frm_field_id']) ) {
 			foreach ( $_POST['frm_field_id'] as $position => $item ) {
@@ -459,7 +462,7 @@ public static function update_order(){
         wp_die();
     }
 
-    public static function change_type($type){
+    public static function change_type($type) {
         $type_switch = array(
             'scale'     => 'radio',
             '10radio'   => 'radio',
@@ -479,8 +482,8 @@ public static function change_type($type){
         return $type;
     }
 
-    public static function display_field_options($display){
-        switch($display['type']){
+    public static function display_field_options($display) {
+        switch($display['type']) {
             case 'captcha':
                 $display['required'] = false;
                 $display['invalid'] = true;
@@ -673,7 +676,7 @@ public static function check_value( $opt, $opt_key, $field ) {
         return $opt;
     }
 
-    public static function check_label($opt){
+    public static function check_label($opt) {
         if ( is_array($opt) ) {
             $opt = (isset($opt['label']) ? $opt['label'] : reset($opt));
         }
diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php
index 2df7c2df59..9fc22f7666 100644
--- a/classes/controllers/FrmFormsController.php
+++ b/classes/controllers/FrmFormsController.php
@@ -1,6 +1,6 @@
 <?php
 
-class FrmFormsController{
+class FrmFormsController {
 
     public static function trigger_load_form_hooks() {
         FrmHooksController::trigger_load_hook( 'load_form_hooks' );
@@ -13,7 +13,7 @@ public static function load_form_hooks() {
         add_filter('frm_form_classes', 'FrmFormsController::form_classes' );
     }
 
-    public static function menu(){
+    public static function menu() {
         add_submenu_page('formidable', 'Formidable | '. __( 'Forms', 'formidable' ), __( 'Forms', 'formidable' ), 'frm_view_forms', 'formidable', 'FrmFormsController::route' );
 
 	    add_filter('get_user_option_managetoplevel_page_formidablecolumnshidden', 'FrmFormsController::hidden_columns' );
@@ -22,7 +22,7 @@ public static function menu(){
         add_filter('manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
     }
 
-    public static function head(){
+    public static function head() {
         wp_enqueue_script('formidable-editinplace');
 
         if ( wp_is_mobile() ) {
@@ -30,12 +30,12 @@ public static function head(){
     	}
     }
 
-    public static function register_widgets(){
+    public static function register_widgets() {
         require_once(FrmAppHelper::plugin_path() . '/classes/widgets/FrmShowForm.php');
         register_widget('FrmShowForm');
     }
 
-    public static function list_form(){
+    public static function list_form() {
         FrmAppHelper::permission_check('frm_view_forms');
 
         $params = FrmFormsHelper::get_params();
@@ -53,9 +53,9 @@ public static function new_form( $values = false ) {
         $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
         $action = $values ? $values[ $action ] : FrmAppHelper::get_param( $action );
 
-        if ($action == 'create'){
+        if ($action == 'create') {
             return self::create($values);
-        }else if ($action == 'new'){
+        } else if ($action == 'new') {
             $frm_field_selection = FrmFieldsHelper::field_selection();
             $values = FrmFormsHelper::setup_new_vars($values);
             $id = FrmForm::create( $values );
@@ -67,7 +67,7 @@ public static function new_form( $values = false ) {
 
             $values['id'] = $id;
             require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/new.php');
-        }else{
+        } else {
             $all_templates = FrmForm::getAll( array( 'is_template' => 1), 'name');
             require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/new-selection.php');
         }
@@ -103,7 +103,7 @@ public static function create( $values = false ) {
 
             $values = FrmAppHelper::setup_edit_vars($form, 'forms', $fields, true);
             require(FrmAppHelper::plugin_path() .'/classes/views/frm-forms/new.php');
-        }else{
+        } else {
             FrmForm::update( $id, $values, true );
             die(FrmAppHelper::js_redirect(admin_url('admin.php?page=formidable&frm_action=settings&id='. $id)));
         }
@@ -125,7 +125,7 @@ public static function settings( $id = false, $message = '' ) {
         return self::get_settings_vars($id, '', $message);
     }
 
-    public static function update_settings(){
+    public static function update_settings() {
         FrmAppHelper::permission_check('frm_edit_forms');
 
         $id = FrmAppHelper::get_param('id');
@@ -143,7 +143,7 @@ public static function update_settings(){
         return self::get_settings_vars($id, '', $message);
     }
 
-    public static function edit_key(){
+    public static function edit_key() {
         check_ajax_referer( 'frm_ajax', 'nonce' );
         FrmAppHelper::permission_check('frm_edit_forms', 'hide');
 
@@ -156,7 +156,7 @@ public static function edit_key(){
         wp_die();
     }
 
-    public static function edit_description(){
+    public static function edit_description() {
         check_ajax_referer( 'frm_ajax', 'nonce' );
         FrmAppHelper::permission_check('frm_edit_forms', 'hide');
 
@@ -208,7 +208,7 @@ public static function bulk_create_template($ids) {
         return __( 'Form template was Successfully Created', 'formidable' );
     }
 
-    public static function duplicate(){
+    public static function duplicate() {
         FrmAppHelper::permission_check('frm_edit_forms');
 
         $params = FrmFormsHelper::get_params();
@@ -221,7 +221,7 @@ public static function duplicate(){
         }
     }
 
-    public static function page_preview(){
+    public static function page_preview() {
         $params = FrmFormsHelper::get_params();
         if ( ! $params['form'] ) {
             return;
@@ -234,7 +234,7 @@ public static function page_preview(){
         return self::show_form($form->id, '', true, true);
     }
 
-    public static function preview(){
+    public static function preview() {
         do_action('frm_wp');
 
         global $frm_vars;
@@ -377,7 +377,7 @@ public static function scheduled_delete($delete_timestamp = '') {
         return $count;
     }
 
-    public static function insert_form_button($content){
+    public static function insert_form_button($content) {
         if ( current_user_can('frm_view_forms') ) {
             $content .= '<a href="#TB_inline?width=50&height=50&inlineId=frm_insert_form" class="thickbox button add_media frm_insert_form" title="' . __( 'Add forms and content', 'formidable' ) . '"><span class="frm-buttons-icon wp-media-buttons-icon"></span> Formidable</a>';
 
@@ -385,7 +385,7 @@ public static function insert_form_button($content){
         return $content;
     }
 
-    public static function insert_form_popup(){
+    public static function insert_form_popup() {
         $page = basename($_SERVER['PHP_SELF']);
         if ( ! in_array($page, array( 'post.php', 'page.php', 'page-new.php', 'post-new.php') ) ) {
             return;
@@ -494,7 +494,7 @@ public static function get_sortable_columns() {
 		);
 	}
 
-	public static function hidden_columns($result){
+	public static function hidden_columns($result) {
         $return = false;
         foreach ( (array) $result as $r ) {
             if ( ! empty( $r ) ) {
@@ -518,7 +518,7 @@ public static function hidden_columns($result){
         return $result;
     }
 
-	public static function save_per_page($save, $option, $value){
+	public static function save_per_page($save, $option, $value) {
         if ( $option == 'formidable_page_formidable_per_page' ) {
             $save = (int) $value;
         }
@@ -620,7 +620,7 @@ public static function form_classes($form) {
         }
     }
 
-    public static function get_email_html(){
+    public static function get_email_html() {
         check_ajax_referer( 'frm_ajax', 'nonce' );
 	    echo FrmEntriesController::show_entry_shortcode( array(
 	        'form_id'       => $_POST['form_id'],
@@ -717,7 +717,7 @@ public static function add_default_templates( $path, $default = true, $template
         $path = untrailingslashit(trim($path));
         $templates = glob( $path .'/*.php' );
 
-        for($i = count($templates) - 1; $i >= 0; $i--){
+        for($i = count($templates) - 1; $i >= 0; $i--) {
             $filename = str_replace( '.php', '', str_replace( $path.'/', '', $templates[ $i ] ) );
             $template_query = array( 'form_key' => $filename);
             if ( $template ) {
@@ -753,7 +753,7 @@ public static function add_default_templates( $path, $default = true, $template
         }
     }
 
-    public static function route(){
+    public static function route() {
         $action = isset($_REQUEST['frm_action']) ? 'frm_action' : 'action';
         $vars = array();
 		if ( isset( $_POST['frm_compact_fields'] ) ) {
@@ -775,7 +775,7 @@ public static function route(){
                 $vars = FrmAppHelper::json_to_array($json_vars);
                 $action = $vars[ $action ];
             }
-        }else{
+        } else {
             $action = FrmAppHelper::get_param($action);
     		if ( isset( $_REQUEST['delete_all'] ) ) {
                 // override the action for this page
@@ -1022,7 +1022,7 @@ public static function get_form_contents($form, $title, $description, $atts) {
             return;
         }
 
-        if ( $created && is_numeric($created) ){
+        if ( $created && is_numeric($created) ) {
             $message = isset($form->options['success_msg']) ? $form->options['success_msg'] : $frm_settings->success_msg;
             $class = 'frm_message';
         } else {
diff --git a/classes/controllers/FrmHooksController.php b/classes/controllers/FrmHooksController.php
index 6b39f3dd1b..28c9f96954 100644
--- a/classes/controllers/FrmHooksController.php
+++ b/classes/controllers/FrmHooksController.php
@@ -1,6 +1,6 @@
 <?php
 
-class FrmHooksController{
+class FrmHooksController {
     /**
      * Trigger plugin-wide hook loading
      */
@@ -40,7 +40,7 @@ public static function trigger_load_hook( $hooks = 'load_hooks' ) {
 
     }
 
-    public function load_hooks(){
+    public function load_hooks() {
         if ( ! is_admin() ) {
             add_filter('the_content', 'FrmAppController::page_route', 10);
         }
diff --git a/classes/controllers/FrmSettingsController.php b/classes/controllers/FrmSettingsController.php
index 00e6b5d7f7..2ae865aecf 100644
--- a/classes/controllers/FrmSettingsController.php
+++ b/classes/controllers/FrmSettingsController.php
@@ -1,12 +1,12 @@
 <?php
 
-class FrmSettingsController{
+class FrmSettingsController {
 
-    public static function menu(){
+    public static function menu() {
         add_submenu_page('formidable', 'Formidable | '. __( 'Global Settings', 'formidable' ), __( 'Global Settings', 'formidable' ), 'frm_change_settings', 'formidable-settings', 'FrmSettingsController::route');
     }
 
-    public static function license_box(){
+    public static function license_box() {
         $a = isset($_GET['t']) ? $_GET['t'] : 'general_settings';
         include(FrmAppHelper::plugin_path() .'/classes/views/frm-settings/license_box.php');
     }
@@ -46,7 +46,7 @@ public static function process_form( $stop_load = false ) {
                 $frm_settings->store();
                 $message = __( 'Settings Saved', 'formidable' );
             }
-        }else{
+        } else {
             $message = __( 'Settings Saved', 'formidable' );
         }
 
diff --git a/classes/controllers/FrmStatisticsController.php b/classes/controllers/FrmStatisticsController.php
index 5532a1d0f2..d082af99a9 100644
--- a/classes/controllers/FrmStatisticsController.php
+++ b/classes/controllers/FrmStatisticsController.php
@@ -1,18 +1,18 @@
 <?php
 
-class FrmStatisticsController{
+class FrmStatisticsController {
 
-    public static function menu(){
+    public static function menu() {
         add_submenu_page( 'formidable', 'Formidable | '. __( 'Views', 'formidable' ), '<span class="frm_inactive_menu">'. __( 'Views', 'formidable' ) .'</span>', 'administrator', 'formidable-entry-templates', 'FrmStatisticsController::list_displays' );
     }
 
-    public static function list_reports(){
+    public static function list_reports() {
         add_filter('frm_form_stop_action_reports', '__return_true');
         $form = FrmAppHelper::get_param('form', false);
         require(FrmAppHelper::plugin_path() .'/classes/views/frm-statistics/list.php');
     }
 
-    public static function list_displays(){
+    public static function list_displays() {
         $form = FrmAppHelper::get_param('form', false);
         require(FrmAppHelper::plugin_path() .'/classes/views/frm-statistics/list_displays.php');
     }
diff --git a/classes/controllers/FrmStylesController.php b/classes/controllers/FrmStylesController.php
index cace6b87b2..7c97fd760d 100644
--- a/classes/controllers/FrmStylesController.php
+++ b/classes/controllers/FrmStylesController.php
@@ -1,6 +1,6 @@
 <?php
 
-class FrmStylesController{
+class FrmStylesController {
     public static $post_type = 'frm_styles';
     public static $screen = 'formidable_page_formidable-styles';
 
@@ -31,7 +31,7 @@ public static function register_post_types() {
         ) );
     }
 
-    public static function menu(){
+    public static function menu() {
         add_submenu_page('formidable', 'Formidable | '. __( 'Styles', 'formidable' ), __( 'Styles', 'formidable' ), 'frm_change_settings', 'formidable-styles', 'FrmStylesController::route');
     }
 
@@ -258,7 +258,7 @@ public static function include_style_section($atts, $sec) {
         include(FrmAppHelper::plugin_path() .'/classes/views/styles/_'. $sec['args'] .'.php');
     }
 
-    public static function load_css(){
+    public static function load_css() {
         header('Content-type: text/css');
 
         $frm_style = new FrmStyle();
diff --git a/classes/controllers/FrmXMLController.php b/classes/controllers/FrmXMLController.php
index b1e37613d6..772061ada1 100644
--- a/classes/controllers/FrmXMLController.php
+++ b/classes/controllers/FrmXMLController.php
@@ -1,13 +1,13 @@
 <?php
 
-class FrmXMLController{
+class FrmXMLController {
 
     public static function menu() {
         add_submenu_page('formidable', 'Formidable | '. __( 'Import/Export', 'formidable' ), __( 'Import/Export', 'formidable' ), 'frm_edit_forms', 'formidable-import', 'FrmXMLController::route');
     }
 
     public static function add_default_templates() {
-        if ( !function_exists( 'libxml_disable_entity_loader' ) ){
+        if ( !function_exists( 'libxml_disable_entity_loader' ) ) {
     		// XML import is not enabled on your server
     		return;
     	}
@@ -42,7 +42,7 @@ public static function route() {
 		} else if ( $action == 'export_xml' ) {
             return self::export_xml();
         } else {
-            if ( apply_filters('frm_xml_route', true, $action) ){
+            if ( apply_filters('frm_xml_route', true, $action) ) {
                 return self::form();
             }
         }
@@ -217,7 +217,7 @@ public static function generate_xml($type, $args = array() ) {
             switch ( $tb_type ) {
                 case 'forms':
                     //add forms
-                    if ( $args['ids'] ){
+                    if ( $args['ids'] ) {
 						$where[] = array( 'or' => 1, $table . '.id' => $args['ids'], $table .'.parent_form_id' => $args['ids'] );
                 	} else {
 						$where[ $table . '.status !' ] = 'draft';
diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php
index c665e6b76e..2195ff76cc 100644
--- a/classes/helpers/FrmAppHelper.php
+++ b/classes/helpers/FrmAppHelper.php
@@ -3,7 +3,7 @@
 	die( 'You are not allowed to call this page directly.' );
 }
 
-class FrmAppHelper{
+class FrmAppHelper {
     public static $db_version = 19; //version of the database we are moving to
     public static $pro_db_version = 27;
 
@@ -16,7 +16,7 @@ class FrmAppHelper{
      * @since 1.07.02
      *
      * @param none
-     * @return float The version of this plugin
+     * @return string The version of this plugin
      */
     public static function plugin_version() {
         return self::$plug_version;
@@ -26,7 +26,7 @@ public static function plugin_folder() {
         return basename(self::plugin_path());
     }
 
-    public static function plugin_path(){
+    public static function plugin_path() {
         return dirname(dirname(dirname(__FILE__)));
     }
 
@@ -46,7 +46,7 @@ public static function plugin_url( $url = '' ) {
     /**
      * @return string Site URL
      */
-    public static function site_url(){
+    public static function site_url() {
         $url = self::plugin_url(site_url());
         return $url;
     }
@@ -68,7 +68,7 @@ public static function site_name() {
      * @since 2.0
      *
      * @param None
-     * @return Object $frm_setings
+     * @return FrmSettings $frm_setings
      */
     public static function get_settings() {
         global $frm_settings;
@@ -83,7 +83,7 @@ public static function get_settings() {
      *
      * @since 2.0
      */
-    public static function update_message($features, $class = ''){
+    public static function update_message($features, $class = '') {
         if ( ! self::pro_is_installed() ) {
             include(self::plugin_path() .'/classes/views/shared/update_message.php');
         }
@@ -162,6 +162,7 @@ public static function is_empty_value( $value, $empty = '' ) {
      * Get any value from the $_SERVER
      *
      * @since 2.0
+     * @param string $value
      * @return string
      */
     public static function get_server_value($value) {
@@ -174,7 +175,7 @@ public static function get_server_value($value) {
      *
      * @return string The IP address of the current user
      */
-    public static function get_ip_address(){
+    public static function get_ip_address() {
         foreach ( array(
             'HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_X_CLUSTER_CLIENT_IP',
             'HTTP_FORWARDED_FOR', 'HTTP_FORWARDED', 'REMOTE_ADDR',
@@ -399,21 +400,21 @@ public static function widget_text_filter_callback( $matches ) {
         return do_shortcode( $matches[0] );
     }
 
-    public static function load_scripts($scripts){
+    public static function load_scripts($scripts) {
         _deprecated_function( __FUNCTION__, '2.0', 'wp_enqueue_script' );
         foreach ( (array) $scripts as $s ) {
             wp_enqueue_script($s);
         }
     }
 
-    public static function load_styles($styles){
+    public static function load_styles($styles) {
         _deprecated_function( __FUNCTION__, '2.0', 'wp_enqueue_style' );
         foreach ( (array) $styles as $s ) {
             wp_enqueue_style($s);
         }
     }
 
-    public static function get_pages(){
+    public static function get_pages() {
 		return get_posts( array( 'post_type' => 'page', 'post_status' => array( 'publish', 'private' ), 'numberposts' => 999, 'orderby' => 'title', 'order' => 'ASC' ) );
     }
 
@@ -490,7 +491,7 @@ public static function frm_capabilities($type = 'auto') {
         return $cap;
     }
 
-    public static function user_has_permission($needed_role){
+    public static function user_has_permission($needed_role) {
         if ( $needed_role == '-1' ) {
             return false;
 		}
@@ -550,6 +551,7 @@ public static function permission_check($permission, $show_message = 'show') {
     /**
      * Check user permission and nonce
      * @since 2.0
+     * @param string $permission
      * @return false|string The permission message or false if allowed
      */
     public static function permission_nonce_error($permission, $nonce_name = '', $nonce = '') {
@@ -576,7 +578,7 @@ public static function checked( $values, $current ) {
 		}
     }
 
-    public static function check_selected($values, $current){
+    public static function check_selected($values, $current) {
         self::recursive_trim($values);
         $current = trim($current);
 
@@ -680,7 +682,7 @@ public static function get_other_val( $opt_key, $field, $parent = false, $pointe
     * @param array $args should include opt_key and field name
     * @return string $other_val
     */
-    public static function prepare_other_input( $field, &$other_opt, &$checked, $args = array() ){
+    public static function prepare_other_input( $field, &$other_opt, &$checked, $args = array() ) {
         //Check if this is an "Other" option
         if ( !self::is_other_opt( $args['opt_key'] ) ) {
             return;
@@ -735,7 +737,7 @@ public static function recursive_trim(&$value) {
     public static function array_flatten( $array ) {
         $return = array();
         foreach ( $array as $key => $value ) {
-            if ( is_array($value) ){
+            if ( is_array($value) ) {
                 $return = array_merge( $return, self::array_flatten($value) );
             } else {
                 $return[ $key ] = $value;
@@ -761,7 +763,7 @@ public static function use_wpautop($content) {
         return $content;
     }
 
-    public static function replace_quotes($val){
+    public static function replace_quotes($val) {
         //Replace double quotes
         $val = str_replace( array( '&#8220;', '&#8221;', '&#8243;'), '"', $val);
         //Replace single quotes
@@ -802,11 +804,11 @@ public static function script_version($handle) {
     	return $ver;
     }
 
-    public static function js_redirect($url){
+    public static function js_redirect($url) {
         return '<script type="text/javascript">window.location="'. $url .'"</script>';
     }
 
-    public static function get_user_id_param($user_id){
+    public static function get_user_id_param($user_id) {
         if ( ! $user_id || empty($user_id) || is_numeric($user_id) ) {
             return $user_id;
         }
@@ -998,6 +1000,9 @@ private static function fill_field_opts($field, array &$field_array, $args) {
         $field_array['size'] = self::get_field_size($field_array);
     }
 
+    /**
+     * @param string $table
+     */
     private static function fill_form_opts($record, $table, $post_values, array &$values) {
         if ( $table == 'entries' ) {
             $form = $record->form_id;
@@ -1108,17 +1113,17 @@ public static function insert_opt_html($args) {
     <?php
     }
 
-    public static function get_us_states(){
+    public static function get_us_states() {
         _deprecated_function( __FUNCTION__, '2.0', 'FrmFieldsHelper::get_us_states' );
         return FrmFieldsHelper::get_us_states();
     }
 
-    public static function get_countries(){
+    public static function get_countries() {
         _deprecated_function( __FUNCTION__, '2.0', 'FrmFieldsHelper::get_countries' );
         return FrmFieldsHelper::get_countries();
     }
 
-    public static function truncate($str, $length, $minword = 3, $continue = '...'){
+    public static function truncate($str, $length, $minword = 3, $continue = '...') {
         if ( is_array( $str ) ) {
             return;
 		}
@@ -1198,8 +1203,9 @@ public static function get_formatted_time($date, $date_format = '', $time_format
      * @return string The time ago in words
      */
     public static function human_time_diff( $from, $to = '' ) {
-    	if ( empty($to) )
-    		$to = time();
+    	if ( empty($to) ) {
+    	    		$to = time();
+    	}
 
     	// Array of time period chunks
     	$chunks = array(
@@ -1216,8 +1222,9 @@ public static function human_time_diff( $from, $to = '' ) {
     	$diff = (int) ($to - $from);
 
     	// Something went wrong with date calculation and we ended up with a negative date.
-    	if ( $diff < 1)
-    		return '0 ' . __( 'seconds', 'formidable' );
+    	if ( $diff < 1) {
+    	    		return '0 ' . __( 'seconds', 'formidable' );
+    	}
 
     	/**
     	 * We only want to output one chunks of time here, eg:
@@ -1233,8 +1240,9 @@ public static function human_time_diff( $from, $to = '' ) {
     		$seconds = $chunks[ $i ][0];
 
     		// Finding the biggest chunk (if the chunk fits, break)
-    		if ( ( $count = floor($diff / $seconds) ) != 0 )
-    			break;
+    		if ( ( $count = floor($diff / $seconds) ) != 0 ) {
+    		    			break;
+    		}
     	}
 
     	// Set output var
@@ -1258,7 +1266,8 @@ public static function human_time_diff( $from, $to = '' ) {
      */
     public static function esc_like($term) {
         global $wpdb;
-        if ( method_exists($wpdb, 'esc_like') ) { // WP 4.0
+        if ( method_exists($wpdb, 'esc_like') ) {
+// WP 4.0
             $term = $wpdb->esc_like( $term );
         } else {
             $term = like_escape( $term );
@@ -1356,6 +1365,10 @@ public static function prepend_and_or_where( $starts_with = ' WHERE ', $where =
     }
 
     // Pagination Methods
+
+    /**
+     * @param integer $current_p
+     */
     public static function get_last_record_num( $r_count, $current_p, $p_size ) {
       return ( ( $r_count < ( $current_p * $p_size ) ) ? $r_count : ( $current_p * $p_size ) );
     }
@@ -1366,7 +1379,7 @@ public static function get_last_record_num( $r_count, $current_p, $p_size ) {
     public static function get_first_record_num( $r_count, $current_p, $p_size ) {
         if ( $current_p == 1 ) {
             return 1;
-        } else{
+        } else {
             return ( self::get_last_record_num( $r_count, ( $current_p - 1 ), $p_size ) + 1 );
         }
     }
@@ -1403,6 +1416,9 @@ public static function get_referer_info(){
         return self::get_server_value('HTTP_REFERER');
     }
 
+    /**
+     * @return boolean
+     */
     public static function json_to_array($json_vars){
         $vars = array();
         foreach ( $json_vars as $jv ) {
@@ -1455,6 +1471,10 @@ public static function json_to_array($json_vars){
         return $vars;
     }
 
+    /**
+     * @param string $name
+     * @param string $l1
+     */
     public static function add_value_to_array( $name, $l1, $val, &$vars ) {
         if ( $name == '' ) {
             $vars[] = $val;
@@ -1525,17 +1545,19 @@ public static function prepare_and_encode( $post_content ) {
         return $post_content;
     }
 
-    public static function maybe_json_decode($string){
+    public static function maybe_json_decode($string) {
         if ( is_array($string) ) {
             return $string;
         }
 
         $new_string = json_decode($string, true);
-        if ( function_exists('json_last_error') ) { // php 5.3+
+        if ( function_exists('json_last_error') ) {
+// php 5.3+
             if ( json_last_error() == JSON_ERROR_NONE ) {
                 $string = $new_string;
             }
-        } else if ( isset($new_string) ) { // php < 5.3 fallback
+        } else if ( isset($new_string) ) {
+// php < 5.3 fallback
             $string = $new_string;
         }
         return $string;
diff --git a/classes/helpers/FrmEntriesHelper.php b/classes/helpers/FrmEntriesHelper.php
index a4bc3a4fb6..18e38d88f6 100644
--- a/classes/helpers/FrmEntriesHelper.php
+++ b/classes/helpers/FrmEntriesHelper.php
@@ -3,7 +3,7 @@
 	die( 'You are not allowed to call this page directly.' );
 }
 
-class FrmEntriesHelper{
+class FrmEntriesHelper {
 
     public static function setup_new_vars( $fields, $form = '', $reset = false ) {
         global $frm_vars;
@@ -112,7 +112,7 @@ public static function setup_new_vars( $fields, $form = '', $reset = false ) {
         return apply_filters('frm_setup_new_entry', $values);
     }
 
-    public static function setup_edit_vars($values, $record){
+    public static function setup_edit_vars($values, $record) {
         //$values['description'] = maybe_unserialize( $record->description );
         $values['item_key'] = isset($_POST['item_key']) ? $_POST['item_key'] : $record->item_key;
         $values['form_id'] = $record->form_id;
@@ -120,7 +120,7 @@ public static function setup_edit_vars($values, $record){
         return apply_filters('frm_setup_edit_entry_vars', $values, $record);
     }
 
-    public static function get_admin_params($form=null){
+    public static function get_admin_params($form=null) {
         $form_id = $form;
         if ( $form === null ) {
             $form_id = self::get_current_form_id();
@@ -140,7 +140,7 @@ public static function get_admin_params($form=null){
         return $values;
     }
 
-    public static function set_current_form($form_id){
+    public static function set_current_form($form_id) {
         global $frm_vars, $wpdb;
 
 		$query = array( 'is_template' => 0, 'status' => array( null, '', 'published' ) );
@@ -165,7 +165,7 @@ public static function get_current_form($form_id = 0) {
         return self::set_current_form($form_id);
     }
 
-    public static function get_current_form_id(){
+    public static function get_current_form_id() {
         $form = self::get_current_form();
         $form_id = $form ? $form->id : 0;
 
@@ -385,7 +385,7 @@ public static function replace_default_message($message, $atts) {
 
         foreach ( $shortcodes[0] as $short_key => $tag ) {
             $add_atts = shortcode_parse_atts( $shortcodes[2][ $short_key ] );
-            if ( $add_atts ){
+            if ( $add_atts ) {
                 $this_atts = array_merge($atts, $add_atts);
             } else {
                 $this_atts = $atts;
@@ -494,7 +494,8 @@ public static function display_value($value, $field, $atts = array()) {
 
         if ( is_array($value) && $atts['type'] != 'file' ) {
             foreach ( $value as $val ) {
-                if ( is_array($val) ) { //TODO: add options for display (li or ,)
+                if ( is_array($val) ) {
+//TODO: add options for display (li or ,)
                     $new_value .= implode($atts['sep'], $val);
                     if ( $atts['type'] != 'data' ) {
                         $new_value .= '<br/>';
@@ -582,7 +583,7 @@ public static function maybe_set_other_validation( $field, &$value, &$args ) {
     * @param string|array $value
     * @param array $args
     */
-    public static function set_other_repeating_vals( $field, &$value, &$args ){
+    public static function set_other_repeating_vals( $field, &$value, &$args ) {
         if ( ! $args['parent_field_id'] ) {
             return;
         }
@@ -649,7 +650,7 @@ public static function entries_dropdown() {
         _deprecated_function( __FUNCTION__, '1.07.09');
     }
 
-    public static function enqueue_scripts($params){
+    public static function enqueue_scripts($params) {
         do_action('frm_enqueue_form_scripts', $params);
     }
 
diff --git a/classes/helpers/FrmFieldsHelper.php b/classes/helpers/FrmFieldsHelper.php
index 4b46463387..6ae6eadb03 100644
--- a/classes/helpers/FrmFieldsHelper.php
+++ b/classes/helpers/FrmFieldsHelper.php
@@ -3,9 +3,9 @@
 	die( 'You are not allowed to call this page directly.' );
 }
 
-class FrmFieldsHelper{
+class FrmFieldsHelper {
 
-    public static function field_selection(){
+    public static function field_selection() {
         $fields = apply_filters('frm_available_fields', array(
             'text'      => __( 'Single Line Text', 'formidable' ),
             'textarea'  => __( 'Paragraph Text', 'formidable' ),
@@ -20,7 +20,7 @@ public static function field_selection(){
         return $fields;
     }
 
-    public static function pro_field_selection(){
+    public static function pro_field_selection() {
         return apply_filters('frm_pro_available_fields', array(
             'end_divider' => array(
                 'name'  => __( 'End Section', 'formidable' ),
@@ -147,7 +147,7 @@ public static function setup_new_vars($type = '', $form_id = '') {
         if ( isset( $setting ) && ! empty( $setting ) ) {
             if ( 'data' == $type ) {
                 $values['field_options']['data_type'] = $setting;
-            }else{
+            } else {
                 $values['field_options'][ $setting ] = 1;
             }
         }
@@ -204,7 +204,7 @@ public static function setup_edit_vars( $record, $doing_ajax = false ) {
                 unset($var, $default);
             }
 
-            foreach ( array( 'field_key' => $record->field_key, 'type' => $record->type, 'default_value'=> $record->default_value, 'field_order' => $record->field_order, 'required' => $record->required) as $var => $default){
+            foreach ( array( 'field_key' => $record->field_key, 'type' => $record->type, 'default_value'=> $record->default_value, 'field_order' => $record->field_order, 'required' => $record->required) as $var => $default) {
                 $values[ $var ] = FrmAppHelper::get_param( $var, $default );
                 unset($var, $default);
             }
@@ -281,7 +281,7 @@ public static function fill_field( &$values, $field, $form_id, $new_key = '' ) {
     /**
      * @since 2.0
      */
-    public static function get_error_msg($field, $error){
+    public static function get_error_msg($field, $error) {
         $frm_settings = FrmAppHelper::get_settings();
         $default_settings = $frm_settings->default_options();
 
@@ -300,8 +300,8 @@ public static function get_form_fields( $form_id, $error = false ) {
         return $fields;
     }
 
-    public static function get_default_html($type='text'){
-        if (apply_filters('frm_normal_field_type_html', true, $type)){
+    public static function get_default_html($type='text') {
+        if (apply_filters('frm_normal_field_type_html', true, $type)) {
             $input = (in_array($type, array( 'radio', 'checkbox', 'data'))) ? '<div class="frm_opt_container">[input]</div>' : '[input]';
             $for = '';
             if ( ! in_array( $type, array( 'radio', 'checkbox', 'data', 'scale') ) ) {
@@ -318,8 +318,9 @@ public static function get_default_html($type='text'){
     [if error]<div class="frm_error">[error]</div>[/if error]
 </div>
 DEFAULT_HTML;
-        }else
-            $default_html = apply_filters('frm_other_custom_html', '', $type);
+        } else {
+                    $default_html = apply_filters('frm_other_custom_html', '', $type);
+        }
 
         return apply_filters('frm_custom_html', $default_html, $type);
     }
@@ -372,7 +373,7 @@ public static function replace_shortcodes($html, $field, $errors = array(), $for
             }
         }
 
-        foreach ( array( 'description' => $field['description'], 'required_label' => $required, 'error' => $error) as $code => $value){
+        foreach ( array( 'description' => $field['description'], 'required_label' => $required, 'error' => $error) as $code => $value) {
             self::remove_inline_conditions( ( $value && $value != '' ), $code, $value, $html );
         }
 
@@ -476,8 +477,9 @@ public static function replace_shortcodes($html, $field, $errors = array(), $for
         }
 
         // remove [collapse_this] when running the free version
-        if (preg_match('/\[(collapse_this)\]/s', $html))
-            $html = str_replace('[collapse_this]', '', $html);
+        if (preg_match('/\[(collapse_this)\]/s', $html)) {
+                    $html = str_replace('[collapse_this]', '', $html);
+        }
 
         return $html;
     }
@@ -523,7 +525,7 @@ public static function get_shortcode_tag($shortcodes, $short_key, $args) {
         return $tag;
     }
 
-    public static function display_recaptcha($field){
+    public static function display_recaptcha($field) {
         $frm_settings = FrmAppHelper::get_settings();
         $lang = apply_filters('frm_recaptcha_lang', $frm_settings->re_lang, $field);
 
@@ -559,7 +561,7 @@ public static function show_single_option($field) {
         }
     }
 
-    public static function dropdown_categories($args){
+    public static function dropdown_categories($args) {
 		$defaults = array( 'field' => false, 'name' => false, 'show_option_all' => ' ' );
         $args = wp_parse_args($args, $defaults);
 
@@ -582,7 +584,7 @@ public static function dropdown_categories($args){
                 $args['field']['value'] = array_diff($args['field']['value'], explode(',', $exclude));
             }
             $selected = reset($args['field']['value']);
-        }else{
+        } else {
             $selected = $args['field']['value'];
         }
 
@@ -723,7 +725,7 @@ public static function basic_replace_shortcodes($value, $form, $entry) {
         return $value;
     }
 
-    public static function get_shortcodes($content, $form_id){
+    public static function get_shortcodes($content, $form_id) {
         if ( FrmAppHelper::pro_is_installed() ) {
             return FrmProDisplaysHelper::get_shortcodes($content, $form_id);
         }
@@ -946,7 +948,7 @@ public static function get_display_value($replace_with, $field, $atts = array())
          return $replace_with;
      }
 
-    public static function get_field_types($type){
+    public static function get_field_types($type) {
         $single_input = array(
             'text', 'textarea', 'rte', 'number', 'email', 'url',
             'image', 'file', 'date', 'phone', 'hidden', 'time',
@@ -988,7 +990,7 @@ public static function show_default_blank_js($default_blank){ ?>
     <?php
     }
 
-    public static function switch_field_ids($val){
+    public static function switch_field_ids($val) {
         global $frm_duplicate_ids;
         $replace = array();
         $replace_with = array();
@@ -1010,14 +1012,14 @@ public static function switch_field_ids($val){
                 $val[ $k ] = str_replace( $replace, $replace_with, $v );
                 unset($k, $v);
             }
-        }else{
+        } else {
             $val = str_replace($replace, $replace_with, $val);
         }
 
         return $val;
     }
 
-    public static function get_us_states(){
+    public static function get_us_states() {
         return apply_filters( 'frm_us_states', array(
             'AL' => 'Alabama', 'AK' => 'Alaska', 'AR' => 'Arkansas', 'AZ' => 'Arizona',
             'CA' => 'California', 'CO' => 'Colorado', 'CT' => 'Connecticut', 'DE' => 'Delaware',
@@ -1036,7 +1038,7 @@ public static function get_us_states(){
         ) );
     }
 
-    public static function get_countries(){
+    public static function get_countries() {
         return apply_filters( 'frm_countries', array(
             __( 'Afghanistan', 'formidable' ), __( 'Albania', 'formidable' ), __( 'Algeria', 'formidable' ),
             __( 'American Samoa', 'formidable' ), __( 'Andorra', 'formidable' ), __( 'Angola', 'formidable' ),
diff --git a/classes/models/FrmDb.php b/classes/models/FrmDb.php
index 75bdef0279..0d942381c4 100644
--- a/classes/models/FrmDb.php
+++ b/classes/models/FrmDb.php
@@ -183,6 +183,10 @@ public static function get_where_clause_and_values( &$args ) {
         $args = compact('where', 'values');
     }
 
+    /**
+     * @param string $base_where
+     * @param string $where
+     */
     public static function parse_where_from_array( $args, $base_where, &$where, &$values ) {
         $condition = ' AND';
         if ( isset( $args['or'] ) ) {
@@ -211,6 +215,10 @@ public static function parse_where_from_array( $args, $base_where, &$where, &$va
         }
     }
 
+    /**
+     * @param string $key
+     * @param string $where
+     */
     private static function interpret_array_to_sql( $key, $value, &$where, &$values ) {
         if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false  ) {
             $k = explode(' ', $key);
@@ -236,6 +244,9 @@ private static function interpret_array_to_sql( $key, $value, &$where, &$values
         }
     }
 
+    /**
+     * @param string $table
+     */
     public static function get_count( $table, $where = array(), $args = array() ) {
         $count = self::get_var( $table, $where, 'COUNT(*)', $args );
         return $count;
@@ -265,6 +276,7 @@ public static function get_col( $table, $where = array(), $field = 'id', $args =
 
     /**
      * @since 2.0
+     * @param string $table
      */
     public static function get_row( $table, $where = array(), $fields = '*', $args = array() ) {
         $args['limit'] = 1;
diff --git a/classes/models/FrmEntry.php b/classes/models/FrmEntry.php
index 211b2190f3..27fc8d926d 100644
--- a/classes/models/FrmEntry.php
+++ b/classes/models/FrmEntry.php
@@ -248,7 +248,7 @@ public static function &destroy( $id ){
 
     public static function &update_form( $id, $value, $form_id ){
         global $wpdb;
-        $form_id = isset($value) ? $form_id : NULL;
+        $form_id = isset($value) ? $form_id : null;
         $result = $wpdb->update( $wpdb->prefix .'frm_items', array( 'form_id' => $form_id), array( 'id' => $id ) );
 		if ( $result ) {
             wp_cache_delete( $id, 'frm_entry');
diff --git a/classes/models/FrmEntryMeta.php b/classes/models/FrmEntryMeta.php
index fb9278cb42..33c3668e1a 100644
--- a/classes/models/FrmEntryMeta.php
+++ b/classes/models/FrmEntryMeta.php
@@ -5,6 +5,9 @@
 
 class FrmEntryMeta{
 
+    /**
+     * @param string $meta_key
+     */
     public static function add_entry_meta($entry_id, $field_id, $meta_key = null, $meta_value) {
         global $wpdb;
 
@@ -29,6 +32,9 @@ public static function add_entry_meta($entry_id, $field_id, $meta_key = null, $m
         return $id;
     }
 
+    /**
+     * @param string $meta_key
+     */
     public static function update_entry_meta($entry_id, $field_id, $meta_key = null, $meta_value){
         if ( ! $field_id ) {
             return false;
@@ -164,6 +170,10 @@ public static function get_entry_metas_for_field( $field_id, $order = '', $limit
         return stripslashes_deep($values);
     }
 
+    /**
+     * @param string $order
+     * @param string $limit
+     */
     private static function meta_field_query($field_id, $order, $limit, $args, array &$query) {
         global $wpdb;
         $query[] = 'SELECT';
@@ -230,6 +240,12 @@ public static function getEntryIds( $where = '', $order_by = '', $limit = '', $u
         return $results;
     }
 
+    /**
+     * @param string $where
+     * @param string $order_by
+     * @param string $limit
+     * @param boolean $unique
+     */
     private static function get_ids_query($where, $order_by, $limit, $unique, $args, array &$query) {
         global $wpdb;
         $query[] = 'SELECT';
diff --git a/classes/models/FrmField.php b/classes/models/FrmField.php
index b96cdc9228..6ce3bd0161 100644
--- a/classes/models/FrmField.php
+++ b/classes/models/FrmField.php
@@ -19,9 +19,9 @@ public static function create( $values, $return = true ) {
 
         $new_values['options'] = $values['options'];
 
-        $new_values['field_order'] = isset($values['field_order']) ? (int) $values['field_order'] : NULL;
+        $new_values['field_order'] = isset($values['field_order']) ? (int) $values['field_order'] : null;
         $new_values['required'] = isset($values['required']) ? (int) $values['required'] : 0;
-        $new_values['form_id'] = isset($values['form_id']) ? (int) $values['form_id'] : NULL;
+        $new_values['form_id'] = isset($values['form_id']) ? (int) $values['form_id'] : null;
         $new_values['field_options'] = $values['field_options'];
         $new_values['created_at'] = current_time('mysql', 1);
 
diff --git a/classes/models/FrmForm.php b/classes/models/FrmForm.php
index e3ddda1054..d43be38060 100644
--- a/classes/models/FrmForm.php
+++ b/classes/models/FrmForm.php
@@ -275,6 +275,7 @@ public static function update_fields($id, $values) {
     }
 
     /**
+     * @param string $status
      * @return int|boolean
      */
     public static function set_status($id, $status) {
diff --git a/classes/models/FrmFormAction.php b/classes/models/FrmFormAction.php
index 49297d28d9..7414b179f6 100644
--- a/classes/models/FrmFormAction.php
+++ b/classes/models/FrmFormAction.php
@@ -93,6 +93,9 @@ public function __construct( $id_base, $name, $action_options = array(), $contro
 		$this->control_options = wp_parse_args( $control_options, array( 'id_base' => $this->id_base) );
 	}
 
+	/**
+	 * @param string $id_base
+	 */
 	public function FrmFormAction( $id_base, $name, $action_options = array(), $control_options = array() ) {
 		FrmFormAction::__construct( $id_base, $name, $action_options, $control_options );
 	}