Rearranged class members