Rearrangement of getters and setters