Replaced mStep with more pythonic m_step; replaces m_step1 with m_step_v (and accordingly) to be more precise