Plenty of getter/setter method removals and changes