Move integer arythmetic into separate class