Lombok-ify a few classes