Code cleaning and optimization
MathMod - https://sourceforge.net/p/mathmod/tickets/2
Authored by: virtualmeet 2018-05-29
Parent: [r487]
Child: [r489]
