Minor refactor card