Refactor currency identification

Here I'm trying to simplify the code the little before attacking the larger methods.