diff --git a/src/main/java/bg/softuni/invoice/init/SeedUserRoles.java b/src/main/java/bg/softuni/invoice/init/SeedUserRoles.java
index b3d70f4..13944e8 100644
--- a/src/main/java/bg/softuni/invoice/init/SeedUserRoles.java
+++ b/src/main/java/bg/softuni/invoice/init/SeedUserRoles.java
@@ -3,7 +3,7 @@
 import bg.softuni.invoice.model.entity.Role;
 import bg.softuni.invoice.model.enumerated.RoleType;
 import bg.softuni.invoice.service.RoleService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
@@ -11,17 +11,12 @@
 import java.util.Arrays;
 
 @Component
+@RequiredArgsConstructor
 public class SeedUserRoles {
 
-    private boolean seedInitialized = false;
-
     private final RoleService roleService;
 
-    @Autowired
-    public SeedUserRoles(RoleService roleService) {
-        this.roleService = roleService;
-    }
-
+    private boolean seedInitialized = false;
 
     @EventListener
     public void seed(ContextRefreshedEvent event) {
diff --git a/src/main/java/bg/softuni/invoice/model/service/RoleServiceModel.java b/src/main/java/bg/softuni/invoice/model/service/RoleServiceModel.java
index 96bf810..9643523 100644
--- a/src/main/java/bg/softuni/invoice/model/service/RoleServiceModel.java
+++ b/src/main/java/bg/softuni/invoice/model/service/RoleServiceModel.java
@@ -1,23 +1,13 @@
 package bg.softuni.invoice.model.service;
 
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
 public class RoleServiceModel {
 
     private String id;
     private String authority;
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getAuthority() {
-        return authority;
-    }
-
-    public void setAuthority(String authority) {
-        this.authority = authority;
-    }
 }
diff --git a/src/main/java/bg/softuni/invoice/service/impl/RoleServiceImpl.java b/src/main/java/bg/softuni/invoice/service/impl/RoleServiceImpl.java
index 7110dbe..b639f08 100644
--- a/src/main/java/bg/softuni/invoice/service/impl/RoleServiceImpl.java
+++ b/src/main/java/bg/softuni/invoice/service/impl/RoleServiceImpl.java
@@ -4,7 +4,7 @@
 import bg.softuni.invoice.model.entity.Role;
 import bg.softuni.invoice.repository.RoleRepository;
 import bg.softuni.invoice.service.RoleService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.HashSet;
@@ -13,15 +13,11 @@
 import static bg.softuni.invoice.constant.ErrorMsg.ROLE_NOT_FOUND;
 
 @Service
+@RequiredArgsConstructor
 public class RoleServiceImpl implements RoleService {
 
     private final RoleRepository roleRepository;
 
-    @Autowired
-    public RoleServiceImpl(RoleRepository roleRepository) {
-        this.roleRepository = roleRepository;
-    }
-
     @Override
     public long getRoleRepositoryCount() {
         return this.roleRepository.count();