Rearrange getter/setter functions around to make it more readable.