Refactor Numeric class