diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Genre.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Genre.java
deleted file mode 100644
index d7cae20a..00000000
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/domain/Genre.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.moire.ultrasonic.domain;
-
-import java.io.Serializable;
-
-public class Genre implements Serializable
-{
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = -3943025175219134028L;
-	private String name;
-	private String index;
-
-	public String getName()
-	{
-		return name;
-	}
-
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-
-	public String getIndex()
-	{
-		return index;
-	}
-
-	public void setIndex(String index)
-	{
-		this.index = index;
-	}
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        Genre genre = (Genre) o;
-
-        if (name != null ? !name.equals(genre.name) : genre.name != null) return false;
-        return index != null ? index.equals(genre.index) : genre.index == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = name != null ? name.hashCode() : 0;
-        result = 31 * result + (index != null ? index.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-	public String toString()
-	{
-		return name;
-	}
-}
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIGenreConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIGenreConverter.kt
index 3719db7a..1cd23f60 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIGenreConverter.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIGenreConverter.kt
@@ -4,9 +4,9 @@ package org.moire.ultrasonic.domain
 
 import org.moire.ultrasonic.api.subsonic.models.Genre as APIGenre
 
-fun APIGenre.toDomainEntity(): Genre = Genre().apply {
-    name = this@toDomainEntity.name
+fun APIGenre.toDomainEntity(): Genre = Genre(
+    name = this@toDomainEntity.name,
     index = this@toDomainEntity.name.substring(0, 1)
-}
+)
 
 fun List<APIGenre>.toDomainEntityList(): List<Genre> = this.map { it.toDomainEntity() }
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/Genre.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/Genre.kt
new file mode 100644
index 00000000..c975d437
--- /dev/null
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/Genre.kt
@@ -0,0 +1,12 @@
+package org.moire.ultrasonic.domain
+
+import java.io.Serializable
+
+data class Genre(
+        val name: String,
+        val index: String
+) : Serializable {
+    companion object {
+        private const val serialVersionUID = -3943025175219134028L
+    }
+}
diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/ApiGenreConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/ApiGenreConverterTest.kt
index a1d79b64..8552bf02 100644
--- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/ApiGenreConverterTest.kt
+++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/ApiGenreConverterTest.kt
@@ -18,8 +18,8 @@ class ApiGenreConverterTest {
         val domainEntity = entity.toDomainEntity()
 
         with(domainEntity) {
-            name `should equal to` entity.name
-            index `should equal to` "s"
+            name `should equal` entity.name
+            index `should equal` "s"
         }
     }