Full refactoring, using a Static Class to do the Math job.
Still using the Shunting-yard algorithm.