diff --git a/Cards.hs b/Cards.hs
index 6e1f9b5..d4a8f37 100644
--- a/Cards.hs
+++ b/Cards.hs
@@ -15,6 +15,7 @@ gCardLib =
    , (S06_Gendo, ciS06_Gendo)
    ]
 
+ciS01_Shinji :: CardInfo
 ciS01_Shinji = CardInfo
    { ciName = "3rd Child - Shinji Ikari"
    , ciFaction = Blue
@@ -29,6 +30,7 @@ ciS01_Shinji = CardInfo
    , ciNextInst = Nothing
    }
 
+ciS02_Asuka :: CardInfo
 ciS02_Asuka = CardInfo
    { ciName = "2nd Child - Asuka Langley-Soryu"
    , ciFaction = Red
@@ -43,6 +45,7 @@ ciS02_Asuka = CardInfo
    , ciNextInst = Nothing
    }
 
+ciS03_Rei :: CardInfo
 ciS03_Rei = CardInfo
    { ciName = "1st Child - Rei Ayanami"
    , ciFaction = White
@@ -57,6 +60,7 @@ ciS03_Rei = CardInfo
    , ciNextInst = Nothing
    }
 
+ciS04_Misato :: CardInfo
 ciS04_Misato = CardInfo
    { ciName = "Misato Katsuragi"
    , ciFaction = Green
@@ -71,6 +75,7 @@ ciS04_Misato = CardInfo
    , ciNextInst = Nothing
    }
 
+ciS05_Ritsuko :: CardInfo
 ciS05_Ritsuko = CardInfo
    { ciName = "Ritsuko Akagi"
    , ciFaction = Yellow
@@ -85,6 +90,7 @@ ciS05_Ritsuko = CardInfo
    , ciNextInst = Nothing
    }
 
+ciS06_Gendo :: CardInfo
 ciS06_Gendo = CardInfo
    { ciName = "Gendo Ikari"
    , ciFaction = Black
diff --git a/Groups.hs b/Groups.hs
index d820bb0..5dadc39 100644
--- a/Groups.hs
+++ b/Groups.hs
@@ -3,6 +3,15 @@ module Groups where
 import Util
 import Types
 
+-- Each factions corresponding Main Character
+defCharsFaction :: Faction -> MainCharacter
+defCharsFaction Blue = Shinji
+defCharsFaction Red = Asuka
+defCharsFaction White = Rei
+defCharsFaction Green = Misato
+defCharsFaction Yellow = Ritsuko
+defCharsFaction Black = Gendo
+
 -- Each characters default adjacents
 defFrens :: MainCharacter -> [MainCharacter]
 defFrens Asuka = [Rei, Shinji, Misato]
diff --git a/Init.hs b/Init.hs
index e116709..ef12b1d 100644
--- a/Init.hs
+++ b/Init.hs
@@ -3,6 +3,7 @@ module Init where
 import Types
 import Cards
 
+initBS :: BoardState
 initBS = BoardState
    { bsNeoTokyo = NeoTokyo
       { ntGroups = [ [Shinji], [Asuka], [Rei], [Misato], [Ritsuko], [Gendo] ]
diff --git a/Print.hs b/Print.hs
index 7d177d4..85b1041 100644
--- a/Print.hs
+++ b/Print.hs
@@ -3,7 +3,6 @@ module Print where
 import Types
 import Groups
 import Data.List
-import Data.Either
 
 printState :: BoardState -> IO ()
 printState bs = do
@@ -11,9 +10,9 @@ printState bs = do
    putStrLn " - Groups -"
    mapM_ putStrLn $ let zipGroups = zip ['A', 'B'.. ] groups in
       map
-         (\(id, x) -> [id] ++ " ~ [ " ++ concatGroup x ++ " ] <-> "
+         (\(gid, x) -> [gid] ++ " ~ [ " ++ concatGroup x ++ " ] <-> "
          ++
-         (map fst $ filter (\(id,y) -> y `elem` (neighborGroups x groups)) zipGroups)
+         (map fst $ filter (\(_,y) -> y `elem` (neighborGroups x groups)) zipGroups)
       ) zipGroups
    putStrLn " - Downed -"
    mapM_ putStrLn $ map 
diff --git a/State.hs b/State.hs
deleted file mode 100644
index 51a0210..0000000
--- a/State.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-module State where
-
-import Types
-
-defCharsFaction :: Faction -> MainCharacter
-defCharsFaction Blue = Shinji
-defCharsFaction Red = Asuka
-defCharsFaction White = Rei
-defCharsFaction Green = Misato
-defCharsFaction Yellow = Ritsuko
-defCharsFaction Black = Gendo