diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..ba926d99
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+/target/
+/.settings/
+/.classpath
+/.project
+
+target/
+.idea/
+*.iml
+*.iws
\ No newline at end of file
diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java
new file mode 100644
index 00000000..085a88b0
--- /dev/null
+++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java
@@ -0,0 +1,86 @@
+package edu.kis.vh.nursery;
+
+/**
+ * Klasa DefaultCountingOutRhymer implementuje licznik, który przechowuje
+ * elementy w tablicy o stałej wielkości. Ma takie opercje jak dodawanie elementu
+ * do tablicy, sprawdzenie czy licznik jest pusty lub pełny oraz podgląd
+ * ostatniego elementu i jego usuwanie z tablicy.
+ */
+public class DefaultCountingOutRhymer {
+    /**
+     * Wartość, która oznacza, że tablica jest pusta.
+     */
+    private static final int EMPTY = -1;
+    /**
+     * Wartość minimalna zwracana przez metodę peekaboo, gdy licznik jest pusty.
+     */
+    private static final int PEEKABOO_MIN = -1;
+    /**
+     * Rozmiar tablicy przechowującej elementy licznika.
+     */
+    private static final int MAX_SIZE = 12;
+    /**
+     * Tablica przechowująca elementy licznika.
+     */
+    private final int[] numbers = new int[MAX_SIZE];
+    /**
+     * Indeks wskazujący na ostatni dodany element w tablicy
+     * z przypisaną wartością domyślną EMPTY.
+     */
+    private int total = EMPTY;
+
+    /**
+     * Zwraca obecny indeks ostatniego elementu w liczniku.
+     * @return indeks ostatniego elementu
+     */
+    public int getTotal() {
+        return total;
+    }
+
+    /**
+     * Dodaje nowy element do tablicy.
+     * Przed dododwaniem sprawdza, czy tablica nie jest pełna
+     * @param in wartość dodawanego elementu
+     */
+    public void countIn(int in) {
+        if (!isFull())
+            numbers[++total] = in;
+    }
+
+    /**
+     * Sprawdza czy licznik jest pusty.
+     * @return true, jak licznik jest pusty, false w przeciwnym przypadku
+     */
+    public boolean callCheck() {
+        return getTotal() == EMPTY;
+    }
+
+    /**
+     * Sprawdza czy licznik jest pełny.
+     * @return true, jak licznik jest pełny, false w przeciwnym przypadku
+     */
+    public boolean isFull() {
+        return getTotal() == MAX_SIZE - 1;
+    }
+
+    /**
+     * Zwraca ostatni dodany element bez jego usuwania z tablicy.
+     * @return ostatni element w tablicy lub -1 (PEEKABOO_MIN) w przypadku pustej tablicy licznika
+     */
+    protected int peekaboo() {
+        if (callCheck())
+            return PEEKABOO_MIN;
+        return numbers[getTotal()];
+    }
+
+    /**
+     * Zwraca ostatni element z tablicy oraz usuwa go.
+     * @return osatni element w tablicy lub -1 (MIN) jeżeli tablica jest pusta
+     */
+    public int countOut() {
+        if (callCheck())
+            return EMPTY;
+        return numbers[total--];
+    }
+
+}
diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
index 28591ada..64b1c763 100644
--- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
@@ -1,21 +1,23 @@
 package edu.kis.vh.nursery;
 
-public class FIFORhymer extends defaultCountingOutRhymer {
+public class FifoRhymer extends DefaultCountingOutRhymer {
+
+    private final DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer();
 
-    public defaultCountingOutRhymer temp = new defaultCountingOutRhymer();
-    
     @Override
     public int countOut() {
         while (!callCheck())
-            
-        temp.countIn(super.countOut());
-        
-        int ret = temp.countOut();
-        
-        while (!temp.callCheck())
-            
-        countIn(temp.countOut());
-        
+            getTemp().countIn(super.countOut());
+
+        int ret = getTemp().countOut();
+
+        while (!getTemp().callCheck())
+            countIn(getTemp().countOut());
+
         return ret;
     }
+
+    public DefaultCountingOutRhymer getTemp() {
+        return temp;
+    }
 }
diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
index 755b2d58..657da884 100644
--- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
@@ -1,17 +1,26 @@
 package edu.kis.vh.nursery;
 
-public class HanoiRhymer extends defaultCountingOutRhymer {
+public class HanoiRhymer extends DefaultCountingOutRhymer {
 
-int totalRejected = 0;
+    private int totalRejected = 0;
 
     public int reportRejected() {
-        return totalRejected;
+        return getTotalRejected();
     }
 
+    @Override
     public void countIn(int in) {
-    if (!callCheck() && in > peekaboo())
-            totalRejected++;
-            else
-                super.countIn(in);
+        if (!callCheck() && in > peekaboo())
+            setTotalRejected(getTotalRejected() + 1);
+        else
+            super.countIn(in);
+    }
+
+    public int getTotalRejected() {
+        return totalRejected;
+    }
+
+    public void setTotalRejected(int totalRejected) {
+        this.totalRejected = totalRejected;
     }
 }
diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
deleted file mode 100644
index 199abf6d..00000000
--- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package edu.kis.vh.nursery;
-
-public class defaultCountingOutRhymer {
-
-    private int[] NUMBERS = new int[12];
-
-    public int total = -1;
-
-    public void countIn(int in) {
-        if (!isFull())
-            NUMBERS[++total] = in;
-    }
-
-        public boolean callCheck() {
-            return total == -1;
-        }
-        
-            public boolean isFull() {
-                return total == 11;
-            }
-        
-                protected int peekaboo() {
-                    if (callCheck())
-                        return -1;
-                    return NUMBERS[total];
-                }
-            
-                    public int countOut() {
-                        if (callCheck())
-                            return -1;
-                        return NUMBERS[total--];
-                    }
-
-}
diff --git a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java
index 60ba2a16..4622b671 100644
--- a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java
+++ b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java
@@ -1,29 +1,28 @@
 package edu.kis.vh.nursery.factory;
 
-import edu.kis.vh.nursery.defaultCountingOutRhymer;
-import edu.kis.vh.nursery.FIFORhymer;
+import edu.kis.vh.nursery.DefaultCountingOutRhymer;
+import edu.kis.vh.nursery.FifoRhymer;
 import edu.kis.vh.nursery.HanoiRhymer;
-import edu.kis.vh.nursery.factory.Rhymersfactory;
 
-public class DefaultRhymersFactory implements Rhymersfactory {
+public class DefaultRhymersFactory implements RhymersFactory {
 
     @Override
-    public defaultCountingOutRhymer GetStandardRhymer() {
-        return new defaultCountingOutRhymer();
+    public DefaultCountingOutRhymer getStandardRhymer() {
+        return new DefaultCountingOutRhymer();
     }
 
     @Override
-    public defaultCountingOutRhymer GetFalseRhymer() {
-        return new defaultCountingOutRhymer();
+    public DefaultCountingOutRhymer getFalseRhymer() {
+        return new DefaultCountingOutRhymer();
     }
 
     @Override
-    public defaultCountingOutRhymer GetFIFORhymer() {
-        return new FIFORhymer();
+    public DefaultCountingOutRhymer getFIFORhymer() {
+        return new FifoRhymer();
     }
 
     @Override
-    public defaultCountingOutRhymer GetHanoiRhymer() {
+    public DefaultCountingOutRhymer getHanoiRhymer() {
         return new HanoiRhymer();
     }
 
diff --git a/src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.java b/src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.java
new file mode 100644
index 00000000..a3f7650d
--- /dev/null
+++ b/src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.java
@@ -0,0 +1,15 @@
+package edu.kis.vh.nursery.factory;
+
+import edu.kis.vh.nursery.DefaultCountingOutRhymer;
+
+public interface RhymersFactory {
+
+    public DefaultCountingOutRhymer getStandardRhymer();
+
+    public DefaultCountingOutRhymer getFalseRhymer();
+
+    public DefaultCountingOutRhymer getFIFORhymer();
+
+    public DefaultCountingOutRhymer getHanoiRhymer();
+
+}
diff --git a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java
deleted file mode 100644
index 033755d0..00000000
--- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package edu.kis.vh.nursery.factory;
-
-import edu.kis.vh.nursery.defaultCountingOutRhymer;
-
-    public interface Rhymersfactory {
-    
-        public defaultCountingOutRhymer GetStandardRhymer();
-        
-        public defaultCountingOutRhymer GetFalseRhymer();
-        
-        public defaultCountingOutRhymer GetFIFORhymer();
-        
-        public defaultCountingOutRhymer GetHanoiRhymer();
-        
-    }
diff --git a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java
index 07efc0a2..84341a03 100644
--- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java
+++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java
@@ -2,21 +2,22 @@
 
 public class IntLinkedList {
 
-    Node last;
-    int i;
+    private static final int MIN = -1;
+    private Node last;
+    private int i;
 
     public void push(int i) {
-        if (last == null)
-            last = new Node(i);
+        if (getLast() == null)
+            setLast(new Node(i));
         else {
-            last.next = new Node(i);
-            last.next.prev = last;
-            last = last.next;
+            getLast().setNext(new Node(i));
+            getLast().getNext().setPrev(getLast());
+            setLast(getLast().getNext());
         }
     }
 
     public boolean isEmpty() {
-        return last == null;
+        return getLast() == null;
     }
 
     public boolean isFull() {
@@ -25,16 +26,24 @@ public boolean isFull() {
 
     public int top() {
         if (isEmpty())
-            return -1;
-        return last.value;
+            return MIN;
+        return getLast().getValue();
     }
 
     public int pop() {
         if (isEmpty())
-            return -1;
-        int ret = last.value;
-        last = last.prev;
+            return MIN;
+        int ret = getLast().getValue();
+        setLast(getLast().getPrev());
         return ret;
     }
 
+    public Node getLast() {
+        return last;
+    }
+
+    public void setLast(Node last) {
+        this.last = last;
+    }
+
 }
diff --git a/src/main/java/edu/kis/vh/nursery/list/Node.java b/src/main/java/edu/kis/vh/nursery/list/Node.java
index 0a2cd75e..04f834df 100644
--- a/src/main/java/edu/kis/vh/nursery/list/Node.java
+++ b/src/main/java/edu/kis/vh/nursery/list/Node.java
@@ -2,11 +2,31 @@
 
 public class Node {
 
-    public int value;
-    public Node prev, next;
+    private final int value;
+    private Node prev;
+    private Node next;
 
     public Node(int i) {
         value = i;
     }
-    
+
+    public int getValue() {
+        return value;
+    }
+
+    public Node getPrev() {
+        return prev;
+    }
+
+    public void setPrev(Node prev) {
+        this.prev = prev;
+    }
+
+    public Node getNext() {
+        return next;
+    }
+
+    public void setNext(Node next) {
+        this.next = next;
+    }
 }
diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java
index 05aba9fa..9db957d6 100644
--- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java
+++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java
@@ -1,35 +1,39 @@
 package edu.kis.vh.nursery;
 
-import edu.kis.vh.nursery.defaultCountingOutRhymer;
+import edu.kis.vh.nursery.DefaultCountingOutRhymer;
 import edu.kis.vh.nursery.HanoiRhymer;
 import edu.kis.vh.nursery.factory.DefaultRhymersFactory;
-import edu.kis.vh.nursery.factory.Rhymersfactory;
+import edu.kis.vh.nursery.factory.RhymersFactory;
 
 class RhymersDemo {
 
     public static void main(String[] args) {
-        Rhymersfactory factory = new DefaultRhymersFactory();
-        
-        defaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(),
-                factory.GetFIFORhymer(), factory.GetHanoiRhymer()};
-        
+        RhymersFactory factory = new DefaultRhymersFactory();
+
+        testRhymers(factory);
+
+    }
+
+    private static void testRhymers(RhymersFactory factory) {
+        DefaultCountingOutRhymer[] rhymers = { factory.getStandardRhymer(), factory.getFalseRhymer(),
+                factory.getFIFORhymer(), factory.getHanoiRhymer()};
+
         for (int i = 1; i < 15; i++)
             for (int j = 0; j < 3; j++)
                 rhymers[j].countIn(i);
-        
+
         java.util.Random rn = new java.util.Random();
         for (int i = 1; i < 15; i++)
             rhymers[3].countIn(rn.nextInt(20));
-        
+
         for (int i = 0; i < rhymers.length; i++) {
             while (!rhymers[i].callCheck())
                 System.out.print(rhymers[i].countOut() + "  ");
             System.out.println();
         }
-        
+
         System.out.println("total rejected is "
                 + ((HanoiRhymer) rhymers[3]).reportRejected());
-        
     }
-    
+
 }
\ No newline at end of file
diff --git a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java
index 144906eb..f0f88d99 100644
--- a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java
+++ b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java
@@ -7,7 +7,7 @@ public class RhymersJUnitTest {
 
     @Test
     public void testCountIn() {
-        defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer();
+        DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer();
         int testValue = 4;
         rhymer.countIn(testValue);
 
@@ -17,7 +17,7 @@ public void testCountIn() {
 
     @Test
     public void testCallCheck() {
-        defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer();
+        DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer();
         boolean result = rhymer.callCheck();
         Assert.assertEquals(true, result);
 
@@ -29,7 +29,7 @@ public void testCallCheck() {
 
     @Test
     public void testIsFull() {
-        defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer();
+        DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer();
         final int STACK_CAPACITY = 12;
         for (int i = 0; i < STACK_CAPACITY; i++) {
             boolean result = rhymer.isFull();
@@ -43,7 +43,7 @@ public void testIsFull() {
 
     @Test
     public void testPeekaboo() {
-        defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer();
+        DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer();
         final int EMPTY_STACK_VALUE = -1;
 
         int result = rhymer.peekaboo();
@@ -60,7 +60,7 @@ public void testPeekaboo() {
 
     @Test
     public void testCountOut() {
-        defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer();
+        DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer();
         final int EMPTY_STACK_VALUE = -1;
 
         int result = rhymer.countOut();