Lombok-ify lots of stuff