diff --git a/src/sys/include/isa/atkbd.h b/src/sys/include/isa/atkbd.h
index 4790532..eba9876 100644
--- a/src/sys/include/isa/atkbd.h
+++ b/src/sys/include/isa/atkbd.h
@@ -27,8 +27,8 @@
 
 *****************************************************************************************/
 
-#ifndef _KEYBOARD_H
-#define _KEYBOARD_H
+#ifndef _ATKBD_H
+#define _ATKBD_H
 
 #define shiftKey      1
 #define controlKey    2
@@ -37,7 +37,7 @@
 #define ledScrolllock 1
 #define ledCapslock   4
 
-int keyboardInit();
+int atkbd_init();
 void keyboardISR();
 void keyboardHandler();
 void setLED();
@@ -46,6 +46,8 @@
 
 /***
  $Log$
+ Revision 1.2  2004/05/21 14:57:16  reddawg
+ Cleaned up
 
  END
  ***/
diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h
index 4570a75..b221f1d 100644
--- a/src/sys/include/ubixos/init.h
+++ b/src/sys/include/ubixos/init.h
@@ -37,11 +37,11 @@
 #include <sys/idt.h>
 #include <ubixos/sched.h>
 #include <isa/pit.h>
+#include <isa/atkbd.h>
 
 typedef int (*intFunctionPTR)();
 
 /*
-  keyboard_init,
   time_init,
   net_init,
   ne2k_init,
@@ -58,6 +58,7 @@
   idt_init,
   sched_init,
   pit_init,
+  atkbd_init,
   };
 
 int init_tasksTotal = sizeof(init_tasks)/sizeof(intFunctionPTR);
diff --git a/src/sys/init/main.c b/src/sys/init/main.c
index 50e84c8..064880c 100644
--- a/src/sys/init/main.c
+++ b/src/sys/init/main.c
@@ -39,9 +39,7 @@
 #include <lib/kprintf.h>
 #include <lib/kmalloc.h>
 #include <lib/bioscall.h>
-#include <isa/pit.h>
 #include <isa/fdc.h>
-#include <isa/atkbd.h>
 #include <isa/mouse.h>
 #include <isa/ne2k.h>
 #include <ubixfs/ubixfs.h>
@@ -91,10 +89,6 @@
     }
 
   //smpInit();     /* Initialize SMP */
-  /* Initialize The Systems Keyboard */
-  if (keyboardInit() != 0x0) {
-    kpanic("Error: Initializing Keyboard\n");
-    }
   //mouseInit();
 
   /* Initialize PCI Sub System */
diff --git a/src/sys/isa/atkbd.c b/src/sys/isa/atkbd.c
index 4da3dac..e9cfd23 100644
--- a/src/sys/isa/atkbd.c
+++ b/src/sys/isa/atkbd.c
@@ -1,27 +1,27 @@
 /*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
+ Copyright (c) 2002-2004 The UbixOS Project
  All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
+ Redistribution and use in source and binary forms, with or without modification, are
+ permitted provided that the following conditions are met:
 
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project nor the names of its
-contributors may be used to endorse or promote products derived from this software
-without specific prior written permission.
+ Redistributions of source code must retain the above copyright notice, this list of
+ conditions, the following disclaimer and the list of authors.  Redistributions in binary
+ form must reproduce the above copyright notice, this list of conditions, the following
+ disclaimer and the list of authors in the documentation and/or other materials provided
+ with the distribution. Neither the name of the UbixOS Project nor the names of its
+ contributors may be used to endorse or promote products derived from this software
+ without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  $Id$
 
@@ -306,7 +306,7 @@
 
 /************************************************************************
 
-Function: int initKeyboard
+Function: int atkbd_init
 
 Description: This function is used to turn on the keyboard
 
@@ -315,7 +315,7 @@
 02/20/2004 - Approved for quality
 
 ************************************************************************/
-int keyboardInit() {
+int atkbd_init() {
 
   /* Insert the IDT vector for the keyboard handler */
   setVector(&keyboardISR, mVec+1, dPresent + dInt + dDpl3);
@@ -460,6 +460,9 @@
 /***
 
  $Log$
+ Revision 1.5  2004/06/17 14:49:14  reddawg
+ atkbd: converted some variables to static
+
  Revision 1.4  2004/06/04 10:19:42  reddawg
  notes: we compile again, thank g-d anyways i was about to cry