Use Getter and AllArgsConstructor where possible, misc formatting