rename and cleanup stochMath