Refactor a bit, cleaner code. Lombok