Code cleaning and optimization
MathMod - https://sourceforge.net/p/mathmod/tickets/2
Authored by: virtualmeet 2017-10-01
Parent: [r432]
Child: [r434]
