diff --git a/src/main/kotlin/com/oliver/kidio/backend/data/database/DatabaseFactory.kt b/src/main/kotlin/com/oliver/kidio/backend/data/database/DatabaseFactory.kt
index 4a41358..8a6fd8a 100644
--- a/src/main/kotlin/com/oliver/kidio/backend/data/database/DatabaseFactory.kt
+++ b/src/main/kotlin/com/oliver/kidio/backend/data/database/DatabaseFactory.kt
@@ -26,7 +26,7 @@ object ScreentimeTable : Table("user_screentime") {
 
 object UserTable : Table("users") {
     val id = varchar("id", 36)
-    val user_username = varchar("username", 50).index(isUnique = true)
+    val username = varchar("username", 50).index(isUnique = true)
     val passwordHash = varchar("password_hash", 255)
 
     override val primaryKey = PrimaryKey(id)
@@ -48,7 +48,7 @@ object DatabaseFactory {
             ?: config.propertyOrNull("storage.database")?.getString() 
             ?: "kidio_db"
 
-        val username = System.getenv("DB_USER") 
+        val dbUsername = System.getenv("DB_USER")
             ?: config.propertyOrNull("storage.username")?.getString() 
             ?: "postgres"
 
@@ -61,7 +61,7 @@ object DatabaseFactory {
         val database = Database.connect(
             url = jdbcURL,
             driver = driverClassName,
-            user = username,
+            user = dbUsername,
             password = password
         )
 
@@ -100,7 +100,7 @@ object DatabaseFactory {
                 UserTable.insert {
                     // ID automatische generierung
                     it[id] = "default_user"
-                    it[user_username] = "default_user"
+                    it[username] = "default_user"
                     it[passwordHash] = "1234"
                 }
             }
diff --git a/src/main/kotlin/com/oliver/kidio/backend/domain/repository/KidioRepository.kt b/src/main/kotlin/com/oliver/kidio/backend/domain/repository/KidioRepository.kt
index 58db7bd..1a7f5d9 100644
--- a/src/main/kotlin/com/oliver/kidio/backend/domain/repository/KidioRepository.kt
+++ b/src/main/kotlin/com/oliver/kidio/backend/domain/repository/KidioRepository.kt
@@ -39,7 +39,7 @@ class ExposedKidioRepository : KidioRepository {
     }
 
     override suspend fun getScreentime(userId: String): Int {
-        var redisKey = "screentime:$userId"
+        val redisKey = "screentime:$userId"
 
         try {
             RedisFactory.getResource().use { jedis ->
@@ -84,11 +84,11 @@ class ExposedKidioRepository : KidioRepository {
 
     override suspend fun findByUsername(username: String): User? = DatabaseFactory.dbQuery {
         UserTable.selectAll()
-            .where { UserTable.user_username eq username }
+            .where { UserTable.username eq username }
             .map {
                 User(
                     id = it[UserTable.id],
-                    username = it[UserTable.user_username],
+                    username = it[UserTable.username],
                     passwordHash = it[UserTable.passwordHash]
                 )
             }