Refactor arithmetic integers