rm private modifiers; rearrange fields