diff --git a/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/NonEmptyCollection.kt b/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/NonEmptyCollection.kt
index 04cdff5..772a3e6 100644
--- a/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/NonEmptyCollection.kt
+++ b/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/NonEmptyCollection.kt
@@ -15,4 +15,5 @@ interface NonEmptyCollection<out T> : Collection<T> {
     message = "Alternative is never used!",
     replaceWith = ReplaceWith("first()")
 )
+
 fun <T> NonEmptyCollection<T>.firstOr(alternative: () -> T): T = first()
diff --git a/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/list/NonEmptyList+plus.kt b/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/list/NonEmptyList+plus.kt
index 591a91f..0a2988b 100644
--- a/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/list/NonEmptyList+plus.kt
+++ b/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/list/NonEmptyList+plus.kt
@@ -6,7 +6,9 @@ operator fun <T> NonEmptyList<T>.plus(value: T): NonEmptyList<T> = full + value
 
 operator fun <T> List<T>.plus(value: T): NonEmptyList<T> = NonEmptyList(this.stdPlus(value))
 
-operator fun <T> NonEmptyList<T>.plus(other: Iterable<T>): NonEmptyList<T> = NonEmptyList(full.stdPlus(other))
+operator fun <T> NonEmptyList<T>.plus(
+    other: Iterable<T>
+): NonEmptyList<T> = NonEmptyList(full.stdPlus(other))
 
 operator fun <T> List<T>.plus(
     other: NonEmptyList<T>
diff --git a/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/list/NonEmptyList.kt b/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/list/NonEmptyList.kt
index 769d9e8..d5166c7 100644
--- a/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/list/NonEmptyList.kt
+++ b/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/list/NonEmptyList.kt
@@ -2,14 +2,24 @@ package com.quickbirdstudios.nonEmptyCollection.list
 
 import com.quickbirdstudios.nonEmptyCollection.NonEmptyCollection
 
-class NonEmptyList<T> internal constructor(internal val full: List<T>) : List<T> by full, NonEmptyCollection<T> {
-    constructor(
+class NonEmptyList<out T> internal constructor(
+    internal val full: List<T>
+) : List<T> by full, NonEmptyCollection<T> {
+
+    internal constructor(
         head: T,
         tail: List<T>
-    ) : this(ArrayList<T>(tail.size + 1).apply { add(head); addAll(tail) })
+    ) : this(
+        full = ArrayList<T>(tail.size + 1).apply {
+            add(head)
+            addAll(tail)
+        }
+    )
 
     init {
-        require(full.isNotEmpty()) { "Fatal Error! This is a bug. Please contact the library author." }
+        require(full.isNotEmpty()) {
+            "Fatal Error! This is a bug. Please contact the library author."
+        }
     }
 
     override fun toString(): String = full.toString()
diff --git a/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/map/NonEmptyMap+plus.kt b/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/map/NonEmptyMap+plus.kt
index 0440be6..fc4da2a 100644
--- a/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/map/NonEmptyMap+plus.kt
+++ b/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/map/NonEmptyMap+plus.kt
@@ -4,9 +4,13 @@ import kotlin.collections.plus as stdPlus
 
 operator fun <K, V> NonEmptyMap<K, V>.plus(entry: Pair<K, V>): NonEmptyMap<K, V> = full + entry
 
-operator fun <K, V> Map<K, V>.plus(entry: Pair<K, V>): NonEmptyMap<K, V> = NonEmptyMap(this.stdPlus(entry))
+operator fun <K, V> Map<K, V>.plus(
+    entry: Pair<K, V>
+): NonEmptyMap<K, V> = NonEmptyMap(this.stdPlus(entry))
 
-operator fun <K, V> NonEmptyMap<K, V>.plus(other: Map<K, V>): NonEmptyMap<K, V> = NonEmptyMap(full.stdPlus(other))
+operator fun <K, V> NonEmptyMap<K, V>.plus(
+    other: Map<K, V>
+): NonEmptyMap<K, V> = NonEmptyMap(full.stdPlus(other))
 
 operator fun <K, V> Map<K, V>.plus(
     other: NonEmptyMap<K, V>
diff --git a/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/map/NonEmptyMap.kt b/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/map/NonEmptyMap.kt
index 2654aaa..1921675 100644
--- a/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/map/NonEmptyMap.kt
+++ b/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/map/NonEmptyMap.kt
@@ -1,13 +1,23 @@
 package com.quickbirdstudios.nonEmptyCollection.map
 
-class NonEmptyMap<K, out V> internal constructor(internal val full: Map<K, V>) : Map<K, V> by full {
-    constructor(
+class NonEmptyMap<K, out V> internal constructor(
+    internal val full: Map<K, V>
+) : Map<K, V> by full {
+
+    internal constructor(
         first: Pair<K, V>,
         rest: Map<K, V>
-    ) : this(LinkedHashMap<K, V>(rest.size + 1).apply { put(first.first, first.second); putAll(rest) })
+    ) : this(
+        full = LinkedHashMap<K, V>(rest.size + 1).apply {
+            put(first.first, first.second)
+            putAll(rest)
+        }
+    )
 
     init {
-        require(full.isNotEmpty()) { "Fatal Error! This is a bug. Please contact the library author." }
+        require(full.isNotEmpty()) {
+            "Fatal Error! This is a bug. Please contact the library author."
+        }
     }
 
     override fun toString(): String = full.toString()
diff --git a/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/set/NonEmptySet.kt b/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/set/NonEmptySet.kt
index 458479a..4bdedd8 100644
--- a/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/set/NonEmptySet.kt
+++ b/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/set/NonEmptySet.kt
@@ -2,13 +2,19 @@ package com.quickbirdstudios.nonEmptyCollection.set
 
 import com.quickbirdstudios.nonEmptyCollection.NonEmptyCollection
 
-class NonEmptySet<T> internal constructor(
+class NonEmptySet<out T> internal constructor(
     internal val full: Set<T>
 ) : Set<T> by full, NonEmptyCollection<T> {
-    constructor(
+
+    internal constructor(
         first: T,
         rest: Set<T>
-    ) : this(HashSet<T>(rest.size + 1).apply { add(first); addAll(rest) })
+    ) : this(
+        full = HashSet<T>(rest.size + 1).apply {
+            add(first)
+            addAll(rest)
+        }
+    )
 
     override fun toString(): String = full.toString()
 
diff --git a/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/unsafe/wrapListOperator.kt b/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/unsafe/wrapListOperator.kt
index cc66a27..3429bda 100644
--- a/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/unsafe/wrapListOperator.kt
+++ b/src/commonMain/kotlin/com/quickbirdstudios/nonEmptyCollection/unsafe/wrapListOperator.kt
@@ -2,7 +2,6 @@
 
 package com.quickbirdstudios.nonEmptyCollection.unsafe
 
-
 import com.quickbirdstudios.nonEmptyCollection.NonEmptyCollection
 import com.quickbirdstudios.nonEmptyCollection.list.NonEmptyList
 import kotlin.experimental.ExperimentalTypeInference