Additionals: Update IBAN method, trim trailing whitespaces

Fixes gh-970
Closes gh-980