refactor currency