Changed instance variable names to m_