Index: kernel/arch/amd64/include/boot/boot.h
===================================================================
--- kernel/arch/amd64/include/boot/boot.h	(revision 0356274ec012e8d0ecb93076d5c5f38a7d24748b)
+++ kernel/arch/amd64/include/boot/boot.h	(revision f476e76f55d2a90975277593ea1bcc21fb6d523c)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup amd64	
+/** @addtogroup amd64	
  * @{
  */
@@ -47,5 +47,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: kernel/arch/amd64/include/pm.h
===================================================================
--- kernel/arch/amd64/include/pm.h	(revision 0356274ec012e8d0ecb93076d5c5f38a7d24748b)
+++ kernel/arch/amd64/include/pm.h	(revision f476e76f55d2a90975277593ea1bcc21fb6d523c)
@@ -69,6 +69,6 @@
 
 
-#define gdtselector(des)	((des)<<3)
-#define idtselector(des)        ((des)<<4)
+#define gdtselector(des)	((des) << 3)
+#define idtselector(des)	((des) << 4)
 
 #define PL_KERNEL	0
Index: kernel/arch/ia32/include/pm.h
===================================================================
--- kernel/arch/ia32/include/pm.h	(revision 0356274ec012e8d0ecb93076d5c5f38a7d24748b)
+++ kernel/arch/ia32/include/pm.h	(revision f476e76f55d2a90975277593ea1bcc21fb6d523c)
@@ -47,5 +47,5 @@
 #define UDATA_DES	4
 #define TSS_DES		5
-#define TLS_DES         6 /* Pointer to Thread-Local-Storage data */
+#define TLS_DES		6 /* Pointer to Thread-Local-Storage data */
 
 #ifdef CONFIG_FB
@@ -59,5 +59,5 @@
 
 
-#define selector(des)	((des)<<3)
+#define selector(des)	((des) << 3)
 
 #define PL_KERNEL	0
Index: kernel/arch/ia32/src/boot/boot.S
===================================================================
--- kernel/arch/ia32/src/boot/boot.S	(revision 0356274ec012e8d0ecb93076d5c5f38a7d24748b)
+++ kernel/arch/ia32/src/boot/boot.S	(revision f476e76f55d2a90975277593ea1bcc21fb6d523c)
@@ -37,7 +37,4 @@
 .section K_TEXT_START, "ax"
 
-KTEXT=8
-KDATA=16
-
 .code32
 .align 4
@@ -57,5 +54,5 @@
 	lgdt KA2PA(bootstrap_gdtr)		# initialize Global Descriptor Table register
 
-	movw $KDATA, %cx
+	movw $selector(KDATA_DES), %cx
 	movw %cx, %es
 	movw %cx, %fs
@@ -64,5 +61,5 @@
 	movw %cx, %ss
 	
-	jmpl $KTEXT, $multiboot_meeting_point
+	jmpl $selector(KTEXT_DES), $multiboot_meeting_point
 	multiboot_meeting_point:
 	
@@ -385,5 +382,5 @@
 9:
 	
-	ljmpl $KTEXT, $(vesa_init_protect - vesa_init + VESA_INIT_SEGMENT << 4)
+	ljmpl $selector(KTEXT_DES), $(vesa_init_protect - vesa_init + VESA_INIT_SEGMENT << 4)
 
 0:# No prefered mode found
@@ -412,5 +409,5 @@
 	popl %esp
 
-	movw $KDATA, %cx
+	movw $selector(KDATA_DES), %cx
 	movw %cx, %es
 	movw %cx, %fs
@@ -419,5 +416,5 @@
 	movw %cx, %ss
 	
-	jmpl $KTEXT, $vesa_meeting_point
+	jmpl $selector(KTEXT_DES), $vesa_meeting_point
 
 .align 4