lombok lib added to make code more readable and shorter
minor refactoring