Further cleanup, replaced m_* prefix with this.*.