Bad logic when dealing with digit pairs
Small simplication