Cleaned up the Math class to follow the standard