Rearrange getters and setters