small rearrange of public attributes