refactored currency