EMI: Math classes cleanup.
EMI: Fixed variable naming.