diff --git a/container/ArrayList.h b/container/ArrayList.h
index f347da8e..426e02b3 100644
--- a/container/ArrayList.h
+++ b/container/ArrayList.h
@@ -26,7 +26,7 @@ public:
 	 * @param maxSize
 	 */
 	ArrayList(count_t maxSize) :
-			size(0), maxSize_(maxSize), allocated(true) {
+		size(0), maxSize_(maxSize), allocated(true) {
 		entries = new T[maxSize];
 	}
 
@@ -41,14 +41,14 @@ public:
 	 * @param size size of data already present in storage
 	 */
 	ArrayList(T *storage, count_t maxSize, count_t size = 0) :
-			size(size), entries(storage), maxSize_(maxSize), allocated(false) {
+		size(size), entries(storage), maxSize_(maxSize), allocated(false) {
 	}
 
-    /**
-     * Copying is forbiden by declaring copy ctor and copy assignment deleted
-     * It is too ambigous in this case.
-     * (Allocate a new backend? Use the same? What to do in an modifying call?)
-     */
+	/**
+	 * Copying is forbiden by declaring copy ctor and copy assignment deleted
+	 * It is too ambigous in this case.
+	 * (Allocate a new backend? Use the same? What to do in an modifying call?)
+	 */
 	ArrayList(const ArrayList& other) = delete;
 	const ArrayList& operator=(const ArrayList& other) = delete;
 
@@ -67,84 +67,84 @@ public:
 		}
 	}
 
-    /**
-     * An Iterator to go trough an ArrayList
-     *
-     * It stores a pointer to an element and increments the
-     * pointer when incremented itself.
-     */
-    class Iterator {
-    public:
-        /**
-         * Empty ctor, points to NULL
-         */
-        Iterator(): value(0) {}
+	/**
+	 * An Iterator to go trough an ArrayList
+	 *
+	 * It stores a pointer to an element and increments the
+	 * pointer when incremented itself.
+	 */
+	class Iterator {
+	public:
+		/**
+		 * Empty ctor, points to NULL
+		 */
+		Iterator(): value(0) {}
 
-        /**
-         * Initializes the Iterator to point to an element
-         *
-         * @param initialize
-         */
-        Iterator(T *initialize) {
-            value = initialize;
-        }
+		/**
+		 * Initializes the Iterator to point to an element
+		 *
+		 * @param initialize
+		 */
+		Iterator(T *initialize) {
+			value = initialize;
+		}
 
-        /**
-         * The current element the iterator points to
-         */
-        T *value;
+		/**
+		 * The current element the iterator points to
+		 */
+		T *value;
 
-        Iterator& operator++() {
-            value++;
-            return *this;
-        }
+		Iterator& operator++() {
+			value++;
+			return *this;
+		}
 
-        Iterator operator++(int) {
-            Iterator tmp(*this);
-            operator++();
-            return tmp;
-        }
+		Iterator operator++(int) {
+			Iterator tmp(*this);
+			operator++();
+			return tmp;
+		}
 
-        Iterator& operator--() {
-            value--;
-            return *this;
-        }
+		Iterator& operator--() {
+			value--;
+			return *this;
+		}
 
-        Iterator operator--(int) {
-            Iterator tmp(*this);
-            operator--();
-            return tmp;
-        }
+		Iterator operator--(int) {
+			Iterator tmp(*this);
+			operator--();
+			return tmp;
+		}
 
-        T& operator*() {
-            return *value;
-        }
+		T& operator*() {
+			return *value;
+		}
 
-        const T& operator*() const {
-            return *value;
-        }
+		const T& operator*() const {
+			return *value;
+		}
 
-        T *operator->() {
-            return value;
-        }
+		T *operator->() {
+			return value;
+		}
 
-        const T *operator->() const {
-            return value;
-        }
+		const T *operator->() const {
+			return value;
+		}
 
 
-        //SHOULDDO this should be implemented as non-member
-        bool operator==(const typename
-        		ArrayList<T, count_t>::Iterator& other) const {
-            return (value == other.value);
-        }
+		//SHOULDDO this should be implemented as non-member
+		bool operator==(const typename
+				ArrayList<T, count_t>::Iterator& other) const {
+			return (value == other.value);
+		}
 
-        //SHOULDDO this should be implemented as non-member
-        bool operator!=(const typename
-        		ArrayList<T, count_t>::Iterator& other) const {
-        	return !(*this == other);
-        }
-    };
+		//SHOULDDO this should be implemented as non-member
+		bool operator!=(const typename
+				ArrayList<T, count_t>::Iterator& other) const {
+			return !(*this == other);
+		}
+	};
 
 	/**
 	 * Iterator pointing to the first stored elmement