diff --git a/src/Form.astro b/src/Form.astro
index 8244189..4c81034 100644
--- a/src/Form.astro
+++ b/src/Form.astro
@@ -1,24 +1,32 @@
 ---
-import {FormGroup} from './form-group';
+import { FormGroup } from './form-group';
 export interface Props {
 	formGroup: FormGroup;
 }
 
 const form: FormGroup = Astro.props.formGroup;
 ---
+
 <form>
-		{form?.controls?.map(control => (
+	{
+		form?.controls?.map((control) => (
 			<div>
-						{(control.labelPosition === 'left')
-							? <label for={control.name}>{control.label}</label>
-							: null}
+				{control.label && (!control.labelPosition || control.labelPosition === 'left') ? (
+					<label for={control.name}>{control.label}</label>
+				) : null}
 
-						<input name={control.name} id={control.name} type={control.type} value={control.value} checked={control.value==='checked'} />
-
-						{(control.labelPosition === 'right')
-							? <label for={control.name}>{control.label}</label>
-							: null}
+				<input
+					name={control.name}
+					id={control.name}
+					type={control.type}
+					value={control.value}
+					checked={control.value === 'checked'}
+				/>
 
+				{control.label && control.labelPosition === 'right' ? (
+					<label for={control.name}>{control.label}</label>
+				) : null}
 			</div>
-		))}
+		))
+	}
 </form>
diff --git a/src/form-group.ts b/src/form-group.ts
index a657830..8671bd1 100644
--- a/src/form-group.ts
+++ b/src/form-group.ts
@@ -1,14 +1,12 @@
-import { FormControl } from "./form-control";
+import { FormControl } from './form-control';
 
 export class FormGroup {
-  controls: FormControl[];
+	controls: FormControl[];
 
-  constructor(controls: FormControl[]) {
-    this.controls = controls.map(control => (
-			{
-				...control,
-				labelPosition: control.labelPosition || 'left'
-			}
-		));
-  }
+	constructor(controls: FormControl[]) {
+		this.controls = controls.map((control) => ({
+			...control,
+			labelPosition: control.labelPosition || 'left',
+		}));
+	}
 }