Issue #375 Refactored number variable