Refactor boxing with Number