Code clean up. Using lombok.