Minor refactoring in Card app