Refactored some to get rid of stupid "m_" beginning.