Introduced lombok to the project, refactored couple of classes