fix class data member reorder warnings