cleaned up data member naming