minor currency refactorings