MathHelper makeover