-Re-order member variables for proper cleanup