Internal refactoring inside Iban classes