Clean up data member declarations