Refactored/cleaned up NumberHelper