All class variables have been prefixed m_* and changed non final constants to final