diff --git a/templates/input.php b/templates/input.php
index 5a9525f985b4da9e0bfc577e9a48e5b035ef4626..b02e5eaccb625c0a3b0d0c1302e97e3eb8064da4 100644
--- a/templates/input.php
+++ b/templates/input.php
@@ -7,100 +7,42 @@
  */
 ?>
 
-<?php
-if (!\in_array($field->get_type(), ['number', 'text', 'hidden'])) {
-    ?>
-	<input type="hidden" name="<?php
-    echo $name_prefix;
-    ?>[<?php
-    echo $field->get_name();
-    ?>]" value="no"/>
-<?php
-}
-?>
+<?php if (!\in_array($field->get_type(), ['number', 'text', 'hidden'])): ?>
+	<input type="hidden" name="<?php echo $name_prefix.'['.$field->get_name().']'; ?>" value="no"/>
+<?php endif; ?>
 
-<?php
-if ($field->get_type() === 'checkbox' && $field->has_sublabel()) {
-    ?>
-<label>
-<?php
-}
-?>
+<?php if ($field->get_type() === 'checkbox' && $field->has_sublabel()): ?><label><?php endif; ?>
 
 <input
-	type="<?php
-echo \esc_attr($field->get_type());
-?>"
-	name="<?php
-echo \esc_attr($name_prefix);
-?>[<?php
-echo \esc_attr($field->get_name());
-?>]"
-	id="<?php
-echo \esc_attr($field->get_id());
-?>"
-
-	<?php
-if ($field->has_classes()) {
-    ?>class="<?php
-    echo \esc_attr($field->get_classes());
-    ?>"<?php
-}
-?>
-
-	<?php
-if ($field->get_type() === 'text' && $field->has_placeholder()) {
-    ?>placeholder="<?php
-    echo \esc_html($field->get_placeholder());
-    ?>"<?php
-}
-?>
-
-<?php
-foreach ($field->get_attributes() as $key => $atr_val) {
-    echo $key;
-    ?>="<?php
-    echo \esc_attr($atr_val);
-    ?>"
-<?php
-}
-?>
-
-<?php
-if ($field->is_required()) {
-    ?>required="required"<?php
-}
-if ($field->is_disabled()) {
-    ?>disabled="disabled"<?php
-}
-if ($field->is_readonly()) {
-    ?>readonly="readonly"<?php
-}
-?>
-
-<?php
-if (\in_array($field->get_type(), ['number', 'text', 'hidden'])) {
-    ?>
-	value="<?php
-    echo \esc_html($value);
-    ?>"
-<?php
-} else {
-    ?>
-	value="yes"
-	<?php
-    if ($value === 'yes') {
-        ?>checked="checked"<?php
-    }
-}
-?>
+	type="<?php echo \esc_attr($field->get_type()); ?>"
+	name="<?php echo \esc_attr($name_prefix).'['.\esc_attr($field->get_name()).']'; ?>"
+	id="<?php echo \esc_attr($field->get_id()); ?>"
+
+	<?php if ($field->has_classes()): ?>
+		class="<?php echo \esc_attr($field->get_classes()); ?>"
+	<?php endif; ?>
+
+	<?php if ($field->get_type() === 'text' && $field->has_placeholder()):?>
+		placeholder="<?php echo \esc_html($field->get_placeholder());?>"
+	<?php endif; ?>
+
+	<?php foreach ($field->get_attributes() as $key => $atr_val):
+        echo $key.'="'.\esc_attr($atr_val).'"'; ?>
+	<?php endforeach; ?>
+
+	<?php if ($field->is_required()): ?>required="required"<?php endif; ?>
+	<?php if ($field->is_disabled()): ?>disabled="disabled"<?php endif; ?>
+	<?php if ($field->is_readonly()): ?>readonly="readonly"<?php endif; ?>
+	<?php if (\in_array($field->get_type(), ['number', 'text', 'hidden'])): ?>
+		value="<?php echo \esc_html($value); ?>"
+	<?php else: ?>
+		value="yes"
+		<?php if ($value === 'yes'): ?>
+			checked="checked"
+		<?php endif; ?>
+	<?php endif; ?>
 />
 
-<?php
-if ($field->get_type() === 'checkbox' && $field->has_sublabel()) {
-    ?>
-	<?php
-    echo \esc_html($field->get_sublabel());
-    ?></label>
-<?php
-}
+<?php if ($field->get_type() === 'checkbox' && $field->has_sublabel()): ?>
+	<?php echo \esc_html($field->get_sublabel()); ?></label>
+<?php endif; ?>