Minor refactoring in Current Value