Lombok some files and small refactorings

Change-Id: I7a4f2a0066d6b59c0853024e8ac7c09c4691b150